inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,999 Commits 325 Branches 2,188 Tags
ae11fef3de434801e1874b47e7cba86fab1dcdf7
Commit Graph

3 Commits

Author SHA1 Message Date
Alan Davis
45cf7ee854 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
102458: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      102346: SIMP CHINESE: Updated Simplified Chinese 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@102571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-24 11:22:38 +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
7e0386f385 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 
102447: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      102346: SIMP CHINESE: Updated Simplified Chinese 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@102557 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2015-04-24 11:06:46 +00:00