Merge branch 'acs-base' into acs

This commit is contained in:
brian 2021-04-02 09:13:32 -04:00
commit d616b9ef3a

5
.env
View File

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