Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: include/identity.php install/update.php util/messages.po view/nl/messages.po
This commit is contained in:
@@ -688,6 +688,7 @@ CREATE TABLE IF NOT EXISTS `likes` (
|
||||
`liker` char(128) NOT NULL DEFAULT '',
|
||||
`likee` char(128) NOT NULL DEFAULT '',
|
||||
`iid` int(11) unsigned NOT NULL DEFAULT '0',
|
||||
`i_mid` char(255) NOT NULL DEFAULT '',
|
||||
`verb` char(255) NOT NULL DEFAULT '',
|
||||
`target_type` char(255) NOT NULL DEFAULT '',
|
||||
`target_id` char(128) NOT NULL DEFAULT '',
|
||||
@@ -696,6 +697,7 @@ CREATE TABLE IF NOT EXISTS `likes` (
|
||||
KEY `liker` (`liker`),
|
||||
KEY `likee` (`likee`),
|
||||
KEY `iid` (`iid`),
|
||||
KEY `i_mid` (`i_mid`),
|
||||
KEY `verb` (`verb`),
|
||||
KEY `target_type` (`target_type`),
|
||||
KEY `channel_id` (`channel_id`),
|
||||
|
||||
Reference in New Issue
Block a user