Claudia Agache
|
446cd15feb
|
Merge remote-tracking branch 'remotes/origin/release/V3.3' into merge-3.4/APPS-238_APPS-104_no
# Conflicts:
# .travis.env-vars.yml
# .travis.yml
# pom.xml
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/DeclareVersionAsRecordTests.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/FileVersionAsRecordTest.java
# rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/records/DeclareVersionAsRecordTests.java
# rm-enterprise/rm-enterprise-repo/.env
# rm-enterprise/rm-enterprise-share/.env
# scripts/dockerLimitMemory.sh
# scripts/startAlfresco.sh
|
2020-11-07 18:50:19 +02:00 |
|