Merge remote-tracking branch 'upstream/develop' into 1702-null-date

Conflicts: include/onepoll.php
2017-03-12 20:54:28 +00:00
parent 60adf67f13 7d1e54664a
commit 1624150db4
27 changed files with 13447 additions and 13110 deletions
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -1526,6 +1526,7 @@ function db_definition($charset) {
 					"uid_contactid_created" => array("uid","contact-id","created"),
 					"uid_created" => array("uid","created"),
 					"uid_commented" => array("uid","commented"),
+					"uid_wall_created" => array("uid","wall","created"),
 					)
 			);
 	$database["tokens"] = array(