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

2017-05-07 14:43:38 -07:00
parent 2c2ee706ac bd3708870d
commit 8c38841a4d
5 changed files with 23 additions and 7 deletions
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -712,7 +712,7 @@ CREATE TABLE "mail" (
  "to_xchan" text NOT NULL DEFAULT '',
  "account_id" bigint  NOT NULL DEFAULT '0',
  "channel_id" bigint  NOT NULL DEFAULT '0',
-  "mail_mimetype char(64) NOT NULL DEFAULT '0',
+  "mail_mimetype" char(64) NOT NULL DEFAULT '0',
  "title" text NOT NULL,
  "body" text NOT NULL,
  "sig" text NOT NULL,