Merge branch 'acs-frontend' into acs-aims

This commit is contained in:
brian 2021-04-02 09:21:23 -04:00
commit ec79404d1c

5
.env
View File

@ -1,6 +1,5 @@
EXTERNAL_RESOURCE_DIR=~ ALFRESCO_DIR=~/alfresco
ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco ALFRESCO_LICENSE_DIR=~/alfresco/license
ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
PROXY_PROTOCOL=http PROXY_PROTOCOL=http
PROXY_HOST=localhost PROXY_HOST=localhost