mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
(RECORD ONLY) Merge branch 'release/V2.4' into release/V2.5
Conflicts: rm-automation/src/main/java/org/alfresco/po/rm/dialog/classification/ClassifyContentDialog.java rm-automation/src/main/java/org/alfresco/po/share/browse/ListItem.java rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_de.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-references.get_de.properties rm-community/rm-community-share/pom.xml
This commit is contained in: