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:
@@ -150,6 +150,15 @@
|
||||
</overrides>
|
||||
</type>
|
||||
|
||||
<type name="test:file-derived">
|
||||
<parent>test:file</parent>
|
||||
</type>
|
||||
|
||||
<type name="test:file-derived-no-archive">
|
||||
<parent>test:file</parent>
|
||||
<archive>false</archive>
|
||||
</type>
|
||||
|
||||
<type name="test:folder">
|
||||
<parent>test:base</parent>
|
||||
<properties>
|
||||
|
Reference in New Issue
Block a user