Merge branch '2.5.x' into saas

This commit is contained in:
Albert Santoni 2014-08-26 13:34:09 -04:00
commit 77ff4ffc3a
4 changed files with 82 additions and 15 deletions

View file

@ -474,11 +474,6 @@
<reference local="mount_name_id" foreign="id"/>
</foreign-key>
</table>
<table name="cc_locale" phpName="CcLocale">
<column name="id" phpName="DbId" primaryKey="true" type="INTEGER" autoIncrement="true" required="true" />
<column name="locale_code" phpName="DbLocaleCode" type="VARCHAR" size="16" required="true" />
<column name="locale_lang" phpName="DbLocaleLang" type="VARCHAR" size="128" required="true" />
</table>
<table name="cc_playout_history" phpName="CcPlayoutHistory">
<column name="id" phpName="DbId" primaryKey="true" type="INTEGER" autoIncrement="true" required="true" />
<column name="file_id" phpName="DbFileId" type="INTEGER" required="false" />