Merge branch 'main' of git.odit.services:lfk/frontend into main

# Conflicts: # docker-compose.yml
2020-12-22 15:51:12 +01:00
parent 9202b473f5 33d8622eb2
commit dbb3aa2740
1 changed files with 1 additions and 1 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,6 @@ services:
    httpd:
        build: .
        volumes:
-            - ./dev.env.js:/usr/share/nginx/html/env.js
+            - ./public/env.sample.js:/usr/share/nginx/html/env.js
        ports:
            - 4050:80