Merge branch 'acs-base' into acs-ats-base

This commit is contained in:
Brian Long 2021-04-02 09:11:22 -04:00
commit 9859e68fe8

5
.env

@ -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