Merge remote-tracking branch 'origin/release/V2.5' into merge/Merge25ToMasterRM-4520

Browse Source

# Conflicts:
#	rm-automation/rm-automation-ui/src/main/java/org/alfresco/po/share/page/SharePage.java
#	rm-automation/src/test/java/org/alfresco/test/enterprise/level2/audit/AuditAccessOnClassifiedContent.java

...

This commit is contained in:

Oana Nechiforescu

2017-01-26 14:38:34 +02:00

parent 4fac165cdb c86d428316

commit dae56ebaa1

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