Merge branch 'dev' into perms

2016-07-12 20:50:27 -07:00
parent a01baab4f0 bdd7d24ac1
commit 6424bac47c
16 changed files with 26 additions and 48 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 '',
+  `chan` int(10) unsigned NOT NULL DEFAULT '0',
  `xchan` char(255) NOT NULL DEFAULT '',
  `cat` char(255) NOT NULL DEFAULT '',
  `k` char(255) NOT NULL DEFAULT '',