Merge remote-tracking branch 'upstream/develop' into issue-3326

2017-04-14 22:30:48 +00:00
parent d7537e7346 a0a0885527
commit e7783e2018
40 changed files with 8412 additions and 8405 deletions
--- a/database.sql
+++ b/database.sql
@@ -159,7 +159,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	`writable` tinyint(1) NOT NULL DEFAULT 0,
 	`forum` tinyint(1) NOT NULL DEFAULT 0,
 	`prv` tinyint(1) NOT NULL DEFAULT 0,
-	`contact-type` int(11) unsigned NOT NULL DEFAULT 0,
+	`contact-type` int(11) NOT NULL DEFAULT 0,
 	`hidden` tinyint(1) NOT NULL DEFAULT 0,
 	`archive` tinyint(1) NOT NULL DEFAULT 0,
 	`pending` tinyint(1) NOT NULL DEFAULT 1,