From 8d32a6073da0253c83e11689d176c2234c06c77c Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Tue, 19 Dec 2006 16:28:32 +0000 Subject: [PATCH] Merge 1.4 to HEAD svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4504 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4505 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4506 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4507 . svn resolved root\projects\core\source\java\log4j.properties svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4548 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4549 . svn resolved root\projects\repository\source\java\org\alfresco\repo\jscript\Node.java svn resolved root\projects\repository\source\java\org\alfresco\repo\jscript\CategoryTemplateNode.java svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4603 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4604 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/web-client-application-context.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/alfresco/web-client-application-context.xml b/config/alfresco/web-client-application-context.xml index b9b014503b..5c757faba3 100644 --- a/config/alfresco/web-client-application-context.xml +++ b/config/alfresco/web-client-application-context.xml @@ -17,6 +17,7 @@ classpath:alfresco/web-client-config-workflow-actions.xml classpath:alfresco/extension/web-client-config-custom.xml classpath:alfresco/extension/web-client-rm-custom.xml + jar:*!/META-INF/web-client-config-custom.xml