inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.1) to 5.1.N (5.1.1)

Browse Source 
121650 sdinuta: CM-710: Merged from alfresco/BRANCHES/DEV/VF_REP_INT_51/root into/alfresco/HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-01-29 14:49:19 +00:00
parent c1d4fccc48
commit 9f2d3441df
63 changed files with 643 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/virtual/model/SystemTemplateLocationsConstraint.java
View File

@@ -57,7 +57,7 @@ public class SystemTemplateLocationsConstraint extends ListOfValuesConstraint
{
public static final String NULL_SYSTEM_TEMPLATE = "nullSystemTemplate";
public static final String NULL_SYSTEM_TEMPLATE_MESSAGE = "vm_virtualization.nullSystemTemplate.message";
public static final String NULL_SYSTEM_TEMPLATE_MESSAGE = "sf_smartFolder.nullSystemTemplate.message";
private NodeService nodeService;