Merge branch 'main' of git.odit.services:lfk/frontend into main
# Conflicts: # docker-compose.yml
This commit is contained in:
		@@ -3,6 +3,6 @@ services:
 | 
				
			|||||||
    httpd:
 | 
					    httpd:
 | 
				
			||||||
        build: .
 | 
					        build: .
 | 
				
			||||||
        volumes:
 | 
					        volumes:
 | 
				
			||||||
            - ./dev.env.js:/usr/share/nginx/html/env.js
 | 
					            - ./public/env.sample.js:/usr/share/nginx/html/env.js
 | 
				
			||||||
        ports:
 | 
					        ports:
 | 
				
			||||||
            - 4050:80
 | 
					            - 4050:80
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user