Merge branch 'release/V2.5' into merge/RM-4703_RM-5135_RM-5300

Browse Source

# Conflicts:
#	rm-automation/rm-automation-ui/src/main/java/org/alfresco/po/share/upload/UploadDialog.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/securitymarks/UpdateContentSecurityMarksPolicyTest.java
#	rm-enterprise/rm-enterprise-repo/src/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMEnterpriseTestCase.java

...

This commit is contained in:

Tuna Aksoy

2017-06-10 21:29:50 +01:00

parent fbd029cd56 1db145c228

commit f8fac80933

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available