mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Big honkin' merge from head. Sheesh!
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -218,6 +218,7 @@
|
||||
<prop key="version.major">${version.major}</prop>
|
||||
<prop key="version.minor">${version.minor}</prop>
|
||||
<prop key="version.revision">${version.revision}</prop>
|
||||
<prop key="version.build">${version.build}</prop>
|
||||
<prop key="version.label">${version.label}</prop>
|
||||
<prop key="version.schema">${version.schema}</prop>
|
||||
<prop key="version.edition">${version.edition}</prop>
|
||||
@@ -254,10 +255,12 @@
|
||||
<prop key="spaces.guest_home.childname">${spaces.guest_home.childname}</prop>
|
||||
<prop key="system.system_container.childname">${system.system_container.childname}</prop>
|
||||
<prop key="system.people_container.childname">${system.people_container.childname}</prop>
|
||||
<prop key="system.workflow_container.childname">${system.workflow_container.childname}</prop>
|
||||
<prop key="spaces.dictionary.childname">${spaces.dictionary.childname}</prop>
|
||||
<prop key="spaces.templates.childname">${spaces.templates.childname}</prop>
|
||||
<prop key="spaces.templates.content.childname">${spaces.templates.content.childname}</prop>
|
||||
<prop key="spaces.templates.email.childname">${spaces.templates.email.childname}</prop>
|
||||
<prop key="spaces.templates.rss.childname">${spaces.templates.rss.childname}</prop>
|
||||
<prop key="spaces.savedsearches.childname">${spaces.savedsearches.childname}</prop>
|
||||
<prop key="spaces.scripts.childname">${spaces.scripts.childname}</prop>
|
||||
</props>
|
||||
|
Reference in New Issue
Block a user