mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
12992: Merged V3.0 to V3.1 12930: Merged V2.2 to V3.0 12713: Fix one part of ETWOTWO-975 (submit conflicts silently fail) ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.0:r12930 Merged /alfresco/BRANCHES/V2.2:r12713 Merged /alfresco/BRANCHES/V3.1:r12992 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13548 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261