Merge branch '2.4.x' into ryerson-history

This commit is contained in:
Naomi 2013-08-30 16:07:41 -04:00
commit 4fd37a4fa0
37 changed files with 2385 additions and 175 deletions

View file

@ -454,7 +454,7 @@
<reference local="instance_id" foreign="id"/>
</foreign-key>
</table>
<table name="cc_mount_name" phpName="CcTimestamp">
<table name="cc_mount_name" phpName="CcMountName">
<column name="id" phpName="DbId" primaryKey="true" type="INTEGER" autoIncrement="true" required="true" />
<column name="mount_name" phpName="DbMountName" type="VARCHAR" required="true" />
</table>