Merge commit 'refs/merge-requests/35' of https://gitorious.org/social/mainline into merge-requests/35

This commit is contained in:
Mikael Nordfeldth 2015-02-08 11:20:53 +01:00
commit 0a599944e9

View File

@ -86,7 +86,7 @@ class FeedSub extends Managed_DataObject
'sub_state' => array('type' => 'enum("subscribe","active","unsubscribe","inactive","nohub")', 'not null' => true, 'description' => 'subscription state'),
'sub_start' => array('type' => 'datetime', 'description' => 'subscription start'),
'sub_end' => array('type' => 'datetime', 'description' => 'subscription end'),
'last_update' => array('type' => 'datetime', 'not null' => true, 'description' => 'when this record was last updated'),
'last_update' => array('type' => 'datetime', 'description' => 'when this record was last updated'),
'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
),