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_postgres.sql
+++ b/install/schema_postgres.sql
@@ -1,6 +1,6 @@
 CREATE TABLE "abconfig" (
  "id" serial  NOT NULL,
-  "chan" bigint NOT NULL,
+  "chan" bigint NOT NULL DEFAULT '0',
  "xchan" text NOT NULL,
  "cat" text NOT NULL,
  "k" text NOT NULL,