Commit Graph

2 Commits

Author SHA1 Message Date
Claudia Agache
c5b9fc3e75 Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/APPS-238_APPS-104_no
# Conflicts:
#	.travis.yml
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/records/RejectRecordTests.java
#	rm-automation/rm-automation-ui/src/test/resources/fp_l3.xml
#	scripts/dockerLimitMemory.sh
2020-11-02 15:43:16 +02:00
Claudia Agache
1909df132a Merge pull request #1245 from Alfresco/merge-3.1/APPS-237_RunERTests_no
Merge 3.1/apps 237 run er tests no
# Conflicts:
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/search/sql/SQLSearchClassifiedDocumentsTests.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/search/sql/SQLSearchRecordCategoryTests.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/search/sql/SQLSearchSecuredDocumentsTests.java
2020-10-12 17:21:48 +03:00