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

2017-05-23 16:14:41 -07:00
parent 357e7af6ad 31d9208172
commit bf580fcc06
46 changed files with 2383 additions and 3362 deletions
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -1,7 +1,7 @@

 CREATE TABLE IF NOT EXISTS `abconfig` (
  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `chan` int(10) unsigned NOT NULL DEFAULT '0',
+  `chan` int(10) unsigned NOT NULL DEFAULT 0 ,
  `xchan` char(191) NOT NULL DEFAULT '',
  `cat` char(191) NOT NULL DEFAULT '',
  `k` char(191) NOT NULL DEFAULT '',