Merge remote-tracking branch 'upstream/master'

Conflicts:
	mod/page.php

1 files changed, 14 insertions, 14 deletions

diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js
index 92f5eb1b2..6b6980037 100644
--- a/doc/html/navtreeindex2.js
+++ b/doc/html/navtreeindex2.js
@@ -1,15 +1,5 @@
 var NAVTREEINDEX2 =
 {
-"classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09":[4,0,8,0],
-"classConversation.html#afb03d1648dbfafe62caa1e30f32f2b1a":[4,0,8,15],
-"classConversation.html#afd4965d22a6e4bfea2f35e931b3273c6":[4,0,8,14],
-"classFKOAuth1.html":[4,0,13],
-"classFKOAuth1.html#a2b1dac2ed31fc6ef84668afdda8b263f":[4,0,13,1],
-"classFKOAuth1.html#a2f1276872329a6f0b704ccda1a4b9fa6":[4,0,13,0],
-"classFKOAuthDataStore.html":[4,0,14],
-"classFKOAuthDataStore.html#a1148d47b546350bf440bdd92792c5df1":[4,0,14,1],
-"classFKOAuthDataStore.html#a431b44d70e3da6a8256ab38f710e3050":[4,0,14,5],
-"classFKOAuthDataStore.html#a434882f03e3cdb171ed89e09e337e934":[4,0,14,4],
 "classFKOAuthDataStore.html#a4edfe2e77ecd2e16ff6b5eb516ed3599":[4,0,14,2],
 "classFKOAuthDataStore.html#a96f76387c3a93b0abe27a98013804bab":[4,0,14,3],
 "classFKOAuthDataStore.html#aa1a268be88ad3979bb4cc35bbb4dc819":[4,0,14,0],
@@ -232,9 +222,8 @@ var NAVTREEINDEX2 =
 "comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a":[5,0,0,15,5],
 "comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e":[5,0,0,15,7],
 "common_8php.html":[5,0,1,12],
-"common_8php.html#a3b12ec67b3d3edcf595c8d195da5d14a":[5,0,1,12,0],
-"common_8php.html#ab63408f39abef7a6915186e8dabc5a96":[5,0,1,12,1],
-"common_8php.html#aca62f113655809f41f49042ce9b123c2":[5,0,1,12,2],
+"common_8php.html#ab63408f39abef7a6915186e8dabc5a96":[5,0,1,12,0],
+"common_8php.html#aca62f113655809f41f49042ce9b123c2":[5,0,1,12,1],
 "community_8php.html":[5,0,1,13],
 "community_8php.html#a1197aafd6a6b540dbb4a0c04ade3a25a":[5,0,1,13,0],
 "community_8php.html#a56c94ec978a38633c5628fa6f8e386d9":[5,0,1,13,1],
@@ -249,5 +238,16 @@ var NAVTREEINDEX2 =
 "connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,15,2],
 "connections_8php.html#af48f7ad20914760ba9874c090384e35a":[5,0,1,15,0],
 "contact__selectors_8php.html":[5,0,0,18],
-"contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75":[5,0,0,18,1]
+"contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75":[5,0,0,18,1],
+"contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[5,0,0,18,0],
+"contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be":[5,0,0,18,3],
+"contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53":[5,0,0,18,2],
+"contact__widgets_8php.html":[5,0,0,19],
+"contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353":[5,0,0,19,0],
+"contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b":[5,0,0,19,2],
+"contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65":[5,0,0,19,1],
+"contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6":[5,0,0,19,3],
+"contactgroup_8php.html":[5,0,1,16],
+"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,16,0],
+"conversation_8php.html":[5,0,0,20]
 };