inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge V1.2.0 BRANCH to HEAD

Browse Source 
svn merge -r 2566:2569 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-03-22 16:21:14 +00:00
parent 506e408ca7
commit d4d33c1e34
5 changed files with 82 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/patch/patch-services-context.xml
View File

@@ -359,4 +359,8 @@
</property>
</bean>
<!-- Note: targetSchema 11 is allocated for patching in an enterprise trial license -->
<!-- A patch bean is not provided as this is handled by the license component internally (enterprise only) -->
>>>>>>> .merge-right.r2569
</beans>

2
config/alfresco/version.properties
View File

@@ -15,4 +15,4 @@ version.edition=Community Network
# Schema number
version.schema=10
version.schema=11