Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

This commit is contained in:
zotlabs
2017-06-07 17:11:35 -07:00
32 changed files with 3492 additions and 570 deletions

View File

@@ -36,9 +36,9 @@ CREATE TABLE IF NOT EXISTS `abook` (
`abook_feed` tinyint(4) NOT NULL DEFAULT 0 ,
`abook_not_here` tinyint(4) NOT NULL DEFAULT 0 ,
`abook_profile` char(191) NOT NULL DEFAULT '',
`abook_incl` TEXT NOT NULL,
`abook_excl` TEXT NOT NULL,
`abook_instance` TEXT NOT NULL,
`abook_incl` text NOT NULL,
`abook_excl` text NOT NULL,
`abook_instance` text NOT NULL,
PRIMARY KEY (`abook_id`),
KEY `abook_account` (`abook_account`),
KEY `abook_channel` (`abook_channel`),