Merge remote-tracking branch 'remotes/origin/feature/RM-6106_ViewAddExemptions_Automate_AC' into feature/RM-6151RemoveExemptionUITests_sm

Browse Source

# Conflicts:
#	rm-automation/rm-automation-ui/src/main/java/org/alfresco/po/share/console/securitycontrols/DeclassificationExemptionsPanel.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/level2/filePlan/ManagePermissionsTests.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/configuration/AddAndViewDeclassificationExemptionsTests.java
#	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-groups.get.properties

...

This commit is contained in:

Rodica Sutu

2018-03-09 10:18:08 +02:00

parent 6ebb19abef 08d409b554

commit 99f32e08e2

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