release: 1.2.23

00-team · Oct 15, 2024 · 5eda53d · 5eda53d
1 parent e225a74
commit 5eda53d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.22
+1.2.23
diff --git a/config/nginx.conf b/config/nginx.conf
@@ -32,15 +32,12 @@ server {
 
     error_page 404 /404/;
 
-<<<<<<< HEAD
     location = /templates/404.html {
         root /var/www/html;
         internal;
     }
 
     # Static content caching
-=======
->>>>>>> efccdd81d2158f5d6f4c01ae7bd6c13e496bc015
     location /static {
         alias /heydari/static;