Merge remote-tracking branch 'upstream/master'

Conflicts:
	boot.php
	include/dba/dba_driver.php
	include/diaspora.php
	include/follow.php
	include/session.php
	include/zot.php
	mod/photos.php
	mod/ping.php

1 files changed, 32 insertions, 32 deletions

diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js
index 8a1528c2d..750d36362 100644
--- a/doc/html/navtreeindex7.js
+++ b/doc/html/navtreeindex7.js
@@ -1,11 +1,26 @@
 var NAVTREEINDEX7 =
 {
+"mod__chanview_8php.html":[6,0,3,1,0,0,0],
+"mod__import_8php.html":[6,0,3,0,4],
+"mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb":[6,0,3,0,4,0],
+"mood_8php.html":[6,0,1,62],
+"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[6,0,1,62,0],
+"mood_8php.html#a7ae136dd7476865b4828136175db5022":[6,0,1,62,1],
+"msearch_8php.html":[6,0,1,63],
+"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[6,0,1,63,0],
+"mytheme_2php_2style_8php.html":[6,0,3,1,3,0,1],
+"mytheme_2php_2theme_8php.html":[6,0,3,1,3,0,2],
+"mytheme_2php_2theme_8php.html#a6ce5df8ece6acc09c1fddaccbeb244e8":[6,0,3,1,3,0,2,0],
+"namespaceFriendica.html":[4,0,1],
+"namespaceFriendica.html":[5,0,1],
+"namespaceRedMatrix.html":[4,0,3],
+"namespaceRedMatrix.html":[5,0,3],
 "namespaceRedMatrix_1_1RedDAV.html":[4,0,3,0],
 "namespaceRedMatrix_1_1RedDAV.html":[5,0,3,0],
 "namespaceRedmatrix.html":[5,0,4],
 "namespaceRedmatrix.html":[4,0,4],
-"namespaceRedmatrix_1_1Import.html":[4,0,4,0],
 "namespaceRedmatrix_1_1Import.html":[5,0,4,0],
+"namespaceRedmatrix_1_1Import.html":[4,0,4,0],
 "namespaceacl__selectors.html":[4,0,0],
 "namespaceacl__selectors.html":[5,0,0],
 "namespacefriendica-to-smarty-tpl.html":[4,0,2],
@@ -14,8 +29,8 @@ var NAVTREEINDEX7 =
 "namespacemembers_func.html":[4,1,1],
 "namespacemembers_vars.html":[4,1,2],
 "namespaces.html":[4,0],
-"namespaceupdatetpl.html":[5,0,5],
 "namespaceupdatetpl.html":[4,0,5],
+"namespaceupdatetpl.html":[5,0,5],
 "namespaceutil.html":[4,0,6],
 "namespaceutil.html":[5,0,6],
 "nav_8php.html":[6,0,0,53],
@@ -200,6 +215,20 @@ var NAVTREEINDEX7 =
 "reddav_8php.html#a5df0d09893f2e65dc5cf6bbab6cfb266":[6,0,0,71,1],
 "reddav_8php.html#a9f531641dfb4e43cd88ac1a9ae7e2088":[6,0,0,71,2],
 "reddav_8php.html#ae92ea0df1993f6a7bcd1b6efa6c1fb66":[6,0,0,71,0],
+"refimport_8php.html":[6,0,0,1,1],
+"refimport_8php.html#a01a29630fa5e1ce6cd5e1fd75280747c":[6,0,0,1,1,2],
+"refimport_8php.html#a53434bc19e6264db89e18d92ddc09860":[6,0,0,1,1,1],
+"refimport_8php.html#a54003135d7c8994a76e831fb6faa2fe6":[6,0,0,1,1,6],
+"refimport_8php.html#a684a44d2401abf75f441591bcb41d10d":[6,0,0,1,1,12],
+"refimport_8php.html#a6c3e0475fde9fe72ff2492a5e3e5259c":[6,0,0,1,1,4],
+"refimport_8php.html#a8459983ebf013ed5737f7ed317bfae1f":[6,0,0,1,1,8],
+"refimport_8php.html#a9c1f681f1f303400a9818696a9f96d6f":[6,0,0,1,1,10],
+"refimport_8php.html#aa98de7d112e3a5b4b6956f108d04a41d":[6,0,0,1,1,3],
+"refimport_8php.html#ac43699d8ae86175e049aa4e87853caac":[6,0,0,1,1,7],
+"refimport_8php.html#ad297afe0730c9119dd94d3cf0521b025":[6,0,0,1,1,9],
+"refimport_8php.html#ad97ebb5feda0230a4834e0b3637a0d29":[6,0,0,1,1,0],
+"refimport_8php.html#ae9c56f779d1e0ac7bcb2a460129e7ae5":[6,0,0,1,1,5],
+"refimport_8php.html#aeec793cefa260f788b7d005adcb35796":[6,0,0,1,1,11],
 "register_8php.html":[6,0,1,97],
 "register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[6,0,1,97,0],
 "register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[6,0,1,97,2],
@@ -220,34 +249,5 @@ var NAVTREEINDEX7 =
 "rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[6,0,1,102,1],
 "rpost_8php.html":[6,0,1,103],
 "rpost_8php.html#a8190354d789000806d9879aea276728f":[6,0,1,103,0],
-"rsd__xml_8php.html":[6,0,1,104],
-"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[6,0,1,104,0],
-"search_8php.html":[6,0,1,105],
-"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[6,0,1,105,0],
-"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[6,0,1,105,1],
-"search__ac_8php.html":[6,0,1,106],
-"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[6,0,1,106,0],
-"security_8php.html":[6,0,0,72],
-"security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[6,0,0,72,2],
-"security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c":[6,0,0,72,11],
-"security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[6,0,0,72,4],
-"security_8php.html#a6126c77a1267e046ac59cf864613f011":[6,0,0,72,10],
-"security_8php.html#a77ba0d1889a39cf32434c5ce96fe1433":[6,0,0,72,5],
-"security_8php.html#a8d23d2597aae380a3341872fe9513380":[6,0,0,72,1],
-"security_8php.html#a9355488460ab11d6058656ff919e5cf9":[6,0,0,72,7],
-"security_8php.html#a9c6180e82150a5a9af91a1255d096b5c":[6,0,0,72,3],
-"security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01":[6,0,0,72,9],
-"security_8php.html#acd06ef411116115c2f0a92633700db8a":[6,0,0,72,6],
-"security_8php.html#adc7bf51e3b8d67bd80e9348f9ab03733":[6,0,0,72,0],
-"security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f":[6,0,0,72,8],
-"service__limits_8php.html":[6,0,1,107],
-"service__limits_8php.html#a653424aac63c5cd05ba70c3c77bf7f8a":[6,0,1,107,0],
-"session_8php.html":[6,0,0,73],
-"session_8php.html#a26fa1042356d555023cbf15ddd4f8507":[6,0,0,73,4],
-"session_8php.html#a4c0ead624f95483e386bc80abf570a8f":[6,0,0,73,0],
-"session_8php.html#a5e1c616e02b863d5450317d101366bb7":[6,0,0,73,1],
-"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb":[6,0,0,73,8],
-"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[6,0,0,73,5],
-"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[6,0,0,73,7],
-"session_8php.html#ac4461c1984543d3553e73dba2771568f":[6,0,0,73,6]
+"rsd__xml_8php.html":[6,0,1,104]
 };