Merge remote-tracking branch 'upstream/develop' into 1701-performance

2017-02-02 06:27:10 +00:00
parent 9a19ae7ce1 2f00683b77
commit 5ffef9c96d
3 changed files with 3 additions and 2 deletions
@@ -1040,6 +1040,7 @@ function db_definition($charset) {
 					"parent-uri" => array("parent-uri"),
 					"extid" => array("extid"),
 					"uid_id" => array("uid","id"),
+					"uid_contactid_id" => array("uid","contact-id","id"),
 					"uid_created" => array("uid","created"),
 					"uid_unseen_contactid" => array("uid","unseen","contact-id"),
 					"uid_network_received" => array("uid","network","received"),