Commit Graph

4 Commits

Author SHA1 Message Date
Alan Davis
0c215ff53d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102459: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      102348: ITALIAN: Updated Italian files based on EN-rev101823. Also this commit is a fix for ACE-3931.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 11:23:19 +00:00
Alan Davis
76d41b1637 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102454:     revert 102447-102450,102442,102440,102437 as the config in MergeMonkey was ahead of the current state and as a result changes were discarded.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 11:21:49 +00:00
Alan Davis
f69444aa4d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102448: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      102348: ITALIAN: Updated Italian files based on EN-rev101823. Also this commit is a fix for ACE-3931.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-24 11:07:23 +00:00
Samuel Langlois
788d3c9c89 Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00