Merge branch 'aims' into acs-aims

Merge branch 'acs-frontend' into acs-aims
Merge branch 'acs-backend' into acs-frontend
2021-04-02 09:21:23 -04:00 · 2021-04-02 09:21:23 -04:00 · 2021-04-02 09:14:46 -04:00 · 2021-04-02 09:14:46 -04:00 · 2021-04-02 09:14:29 -04:00 · 2021-04-02 09:14:28 -04:00
1 changed files with 2 additions and 3 deletions
@@ -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
Author	SHA1	Message	Date
brian	d15d9d291c	Merge branch 'aims' into acs-aims	2021-04-02 09:21:23 -04:00
brian	ec79404d1c	Merge branch 'acs-frontend' into acs-aims	2021-04-02 09:21:23 -04:00
brian	26adfeee1c	Merge branch 'acs-backend' into acs-frontend	2021-04-02 09:14:46 -04:00
brian	68d0eeab49	Merge branch 'acs-share-base' into acs-frontend	2021-04-02 09:14:46 -04:00
brian	456950f31d	Merge branch 'acs-lats' into acs-backend	2021-04-02 09:14:29 -04:00
brian	6740f23779	Merge branch 'acs-search' into acs-backend	2021-04-02 09:14:28 -04:00
brian	880221a953	Merge branch 'acs-lats-base' into acs-lats	2021-04-02 09:14:00 -04:00
brian	398d6692f8	Merge branch 'acs' into acs-lats	2021-04-02 09:13:59 -04:00
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	5a16e389c4	Merge branch 'acs-base' into acs-lats-base	2021-04-02 09:13:25 -04:00
brian	bf09b85448	Merge branch 'acs-base' into acs-share-base	2021-04-02 09:13:10 -04:00
brian	f23cda3fd1	Merge branch 'proxy' into aims	2021-04-02 09:12:59 -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