Merge branch 'aims' into aims-persist

This commit is contained in:
brian 2021-04-02 09:13:34 -04:00
commit 96e4ea2d20

2
.env
View File

@ -1,5 +1,3 @@
EXTERNAL_RESOURCE_DIR=~
PROXY_PROTOCOL=http PROXY_PROTOCOL=http
PROXY_HOST=localhost PROXY_HOST=localhost
PROXY_PORT=8080 PROXY_PORT=8080