Merged 'master'.

Browse Source

Conflicts:
	rm-automation/src/main/java/org/alfresco/po/rm/browse/fileplan/Record.java
	rm-automation/src/main/java/org/alfresco/po/rm/classification/ClassificationPage.java
	rm-automation/src/main/java/org/alfresco/po/rm/security/SecurityGroup.java
	rm-automation/src/test/java/org/alfresco/test/integration/security/UsersClearanceDetails.java
	rm-community/rm-community-share/pom.xml
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get.js

...

This commit is contained in:

ddraper

2016-07-04 11:24:07 +01:00

parent 001eaa649c b73fa7d7aa

commit 397bb939fb

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