Merged V2.1 to HEAD

6467, 6468: Patch to remove submitted aspect data
         Resolved conflicted state of 'root\projects\repository\config\alfresco\version.properties'
         Resolved conflicted state of 'root\projects\repository\config\alfresco\patch\patch-services-context.xml'
         Version number to 104


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6738 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 23:04:39 +00:00
parent bcfd0ae519
commit 7a522e4b88
6 changed files with 69 additions and 11 deletions

View File

@@ -285,16 +285,6 @@
</properties>
</aspect>
<aspect name="wcmwf:submitted">
<properties>
<property name="wcmwf:workflowInstanceId">
<title>Workflow Instance Id</title>
<type>d:text</type>
<mandatory>true</mandatory>
</property>
</properties>
</aspect>
</aspects>
</model>