Alan Davis 4a18a13f7b Merged HEAD (5.2) to 5.2.N (5.2.1) ...

127619 jkaabimofrad: Missed changes during resolving conflicts.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2016-06-03 15:19:40 +00:00

..

package-info.java

Update source headers - add new Copyrights for new Java files synced from Head (part 4).

2016-05-11 14:39:44 +00:00

QuickShareLinkEntityResource.java

Update source headers - add new Copyrights for new Java files synced from Head (part 4).

2016-05-11 14:39:44 +00:00

QuickShareLinkRenditionsRelation.java

Merged HEAD (5.2) to 5.2.N (5.2.1)

2016-06-03 15:19:40 +00:00