Merge branch 'acs-search-base' into acs-search

Merge branch 'acs' into acs-search
Merge branch 'acs-base' into acs
2021-04-02 09:13:42 -04:00 · 2021-04-02 09:13:41 -04:00 · 2021-04-02 09:13:32 -04:00 · 2021-04-02 09:13:30 -04:00 · 2021-04-02 08:42:43 -04:00 · 2021-04-02 08:41:45 -04:00
1 changed files with 2 additions and 3 deletions
--- a/.env
+++ b/.env
@@ -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_HOST=localhost
Author	SHA1	Message	Date
brian	99d39fa7f7	Merge branch 'acs-search-base' into acs-search	2021-04-02 09:13:42 -04:00
brian	1778fd04a4	Merge branch 'acs' into acs-search	2021-04-02 09:13:41 -04:00
brian	d616b9ef3a	Merge branch 'acs-base' into acs	2021-04-02 09:13:32 -04:00
brian	a72d43a6af	Merge branch 'acs-base' into acs-search-base	2021-04-02 09:13:30 -04:00
Brian Long	6bce626075	Merge branch 'proxy' into acs-base	2021-04-02 08:42:43 -04:00
Brian Long	3d6aa1d4bc	Merge branch 'base' into proxy	2021-04-02 08:41:45 -04:00
Brian Long	91ad3afc0a	removed external dir	2021-04-02 08:40:18 -04:00