Commit Graph

6 Commits

Author SHA1 Message Date
Claudia Agache
df70cda5e8 Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/APPS-238_APPS-104_no
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/classification/content/documents/ClassifyActionTest.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/guides/GuidesAndPartialClearanceTests.java
#	scripts/dockerLimitMemory.sh
2020-11-05 16:57:56 +02:00
Claudia Agache
3be0ce1e14 Merge remote-tracking branch 'remotes/origin/release/V3.2' into merge-3.3/APPS-235_SetupEnv_no
# Conflicts:
#	.travis.yml
2020-07-16 14:57:52 +03:00
cagache
cc5fb22195 updated scripts because I can't use general scripts to start/stop alfresco from different subdirectories 2018-06-29 11:09:15 +03:00
cagache
5de20477ee moved scripts to specific directory 2018-06-28 16:47:02 +03:00
cagache
85d1c74807 moved sh files to root 2018-06-28 15:10:11 +03:00
cagache
34ddaf0b3b created scripts used to start/stop alfresco 2018-06-28 14:21:22 +03:00