Afternoon merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-17 22:42:03 +00:00
parent 8818e8daba
commit bfd0d2a337
17 changed files with 445 additions and 85 deletions

View File

@@ -279,8 +279,8 @@
<property name="id"><value>patch.forumsIcons</value></property>
<property name="description"><value>patch.forumsIcons.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>7</value></property>
<property name="targetSchema"><value>8</value></property>
<property name="fixesToSchema"><value>12</value></property>
<property name="targetSchema"><value>13</value></property>
<property name="importerBootstrap">
<ref bean="spacesBootstrap" />
</property>
@@ -289,8 +289,8 @@
<property name="id"><value>patch.emailTemplatesFolder</value></property>
<property name="description"><value>patch.emailTemplatesFolder.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>8</value></property>
<property name="targetSchema"><value>9</value></property>
<property name="fixesToSchema"><value>12</value></property>
<property name="targetSchema"><value>13</value></property>
<!-- helper beans for execution -->
<property name="importerBootstrap">
<ref bean="spacesBootstrap" />
@@ -303,8 +303,8 @@
<property name="id"><value>patch.emailTemplatesContent</value></property>
<property name="description"><value>patch.emailTemplatesContent.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>9</value></property>
<property name="targetSchema"><value>10</value></property>
<property name="fixesToSchema"><value>12</value></property>
<property name="targetSchema"><value>13</value></property>
<property name="templatesACP"><value>alfresco/templates/email_templates.acp</value></property>
<!-- helper beans for execution -->
<property name="importerBootstrap">