Merge branch 'main' into fix/brand_page

Author: alex289

docker/default.conf

@@ -28,7 +28,7 @@ server {
             return 301 /$1;
         }
 
-        try_files $uri $uri/ /index.html;
+        try_files $uri/index.html $uri =404;
     }
 
     # assets, media