2 Commits

Author SHA1 Message Date
Neil McErlean
23a91da204 Added missing license header to file.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-14 13:19:33 +00:00
Mark Rogers
afe200fbd5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84811: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      82464: ACE-1246 "Allow the customer to change the document encryption key"
      Encrypting content store


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85170 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 08:36:54 +00:00