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
This commit is contained in:
Alan Davis
2016-06-03 15:19:40 +00:00
parent dc067d1878
commit 4a18a13f7b
6 changed files with 25 additions and 1 deletions

View File

@@ -289,3 +289,4 @@ public interface Nodes
String PARAM_ISPRIMARY = "isPrimary";
String PARAM_ASSOC_TYPE = "assocType";
}