Merge branch 'dev'

luckyaigit · Feb 1, 2023 · f28f6bb · f28f6bb
2 parents 33e3c72 + a4643e7
commit f28f6bb
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,8 +18,8 @@ tmp
 /waifu2x/web/config.ini
 /waifu2x/public_html  # for compatibilityfor
 /waifu2x/web/public_html
-/waifu2x/web/unlimited_waifu2x/public_html/models
-/waifu2x/web/unlimited_waifu2x/public_html/ads.txt
+/waifu2x/unlimited_waifu2x/public_html/models
+/waifu2x/unlimited_waifu2x/public_html/ads.txt
 !/waifu2x/web/webgen/assets/*.png
 !/waifu2x/web/webgen/assets/*.jpg
 /waifu2x/models/_*.py

diff --git a/waifu2x/README.md b/waifu2x/README.md
@@ -28,7 +28,7 @@ See [waifu2x Web Application](docs/web.md)
 
 # Web Application (in-browser)
 
-See [unlimited:waifu2x](web/unlimited_waifu2x/)
+See [unlimited:waifu2x](unlimited_waifu2x/)
 
 # Training
 

diff --git a/waifu2x/web/unlimited_waifu2x/README.md → waifu2x/unlimited_waifu2x/README.md b/waifu2x/web/unlimited_waifu2x/README.md → waifu2x/unlimited_waifu2x/README.md
diff --git a/...ed_waifu2x/appendix/unlimited.waifu2x.net → ...ed_waifu2x/appendix/unlimited.waifu2x.net b/...ed_waifu2x/appendix/unlimited.waifu2x.net → ...ed_waifu2x/appendix/unlimited.waifu2x.net
@@ -1,7 +1,7 @@
 server {
        server_name unlimited.waifu2x.net;
        access_log	/var/log/nginx/unlimited.waifu2x.net.access.log;
-       root   /home/nagadomi/nunif/waifu2x/web/unlimited_waifu2x/public_html;
+       root   /home/nagadomi/nunif/waifu2x/unlimited_waifu2x/public_html;
 
        location ~ ^/(apple-touch-icon|browserconfig|mstile)(.*)\.(png|xml|ico)$ {
           return 204;

diff --git a/...unlimited_waifu2x/public_html/favicon.ico → ...unlimited_waifu2x/public_html/favicon.ico b/...unlimited_waifu2x/public_html/favicon.ico → ...unlimited_waifu2x/public_html/favicon.ico
diff --git a/.../unlimited_waifu2x/public_html/index.html → .../unlimited_waifu2x/public_html/index.html b/.../unlimited_waifu2x/public_html/index.html → .../unlimited_waifu2x/public_html/index.html
diff --git a/...b/unlimited_waifu2x/public_html/script.js → ...x/unlimited_waifu2x/public_html/script.js b/...b/unlimited_waifu2x/public_html/script.js → ...x/unlimited_waifu2x/public_html/script.js
diff --git a/...b/unlimited_waifu2x/public_html/style.css → ...x/unlimited_waifu2x/public_html/style.css b/...b/unlimited_waifu2x/public_html/style.css → ...x/unlimited_waifu2x/public_html/style.css
diff --git a/waifu2x/web/unlimited_waifu2x/test_server.py → waifu2x/unlimited_waifu2x/test_server.py b/waifu2x/web/unlimited_waifu2x/test_server.py → waifu2x/unlimited_waifu2x/test_server.py