Merge remote-tracking branch 'refs/remotes/origin/develop' into Issue-#2816-2

2016-10-06 20:58:28 -04:00
parent 3e46c69bf6 9ecd901e44
commit 645fd414d5
20 changed files with 2411 additions and 2218 deletions
--- a/database.sql
+++ b/database.sql
@@ -328,6 +328,7 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
 	`gender` varchar(32) NOT NULL DEFAULT '',
 	`birthday` varchar(32) NOT NULL DEFAULT '0000-00-00',
 	`community` tinyint(1) NOT NULL DEFAULT 0,
+	`contact-type` tinyint(1) NOT NULL DEFAULT -1,
 	`hide` tinyint(1) NOT NULL DEFAULT 0,
 	`nsfw` tinyint(1) NOT NULL DEFAULT 0,
 	`network` varchar(255) NOT NULL DEFAULT '',