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, 18 insertions, 18 deletions

diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js
index 1bd667200..4976e91e3 100644
--- a/doc/html/navtreeindex6.js
+++ b/doc/html/navtreeindex6.js
@@ -1,5 +1,19 @@
 var NAVTREEINDEX6 =
 {
+"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571":[6,0,0,51,5],
+"include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a":[6,0,0,51,2],
+"include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa":[6,0,0,51,6],
+"include_2menu_8php.html#ad87f51ce85172bcc3f931aa0cd96a804":[6,0,0,51,4],
+"include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8":[6,0,0,51,0],
+"include_2message_8php.html":[6,0,0,52],
+"include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091":[6,0,0,52,2],
+"include_2message_8php.html#a5f8de9847e203329e317ac38dc646898":[6,0,0,52,1],
+"include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e":[6,0,0,52,3],
+"include_2message_8php.html#a751ffd6635022b2190f56154ee745752":[6,0,0,52,4],
+"include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1":[6,0,0,52,0],
+"include_2network_8php.html":[6,0,0,54],
+"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[6,0,0,54,7],
+"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[6,0,0,54,14],
 "include_2network_8php.html#a316f318167a039c89719afbd129a8f3c":[6,0,0,54,16],
 "include_2network_8php.html#a3e6c751a51de33ad3563f0938296e78a":[6,0,0,54,20],
 "include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b":[6,0,0,54,6],
@@ -117,7 +131,6 @@ var NAVTREEINDEX6 =
 "items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[6,0,0,49,12],
 "items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[6,0,0,49,33],
 "items_8php.html#a9b449eeae50003414b8b30ca927af434":[6,0,0,49,70],
-"items_8php.html#aa2d3caa2f27720762b5c729e07df40fb":[6,0,0,49,51],
 "items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[6,0,0,49,68],
 "items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[6,0,0,49,11],
 "items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[6,0,0,49,23],
@@ -127,6 +140,7 @@ var NAVTREEINDEX6 =
 "items_8php.html#aabfaa193b83154c2a81e91284e5d5e59":[6,0,0,49,69],
 "items_8php.html#aac8c9eb4338e2a996c43914392c6cfdb":[6,0,0,49,15],
 "items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[6,0,0,49,65],
+"items_8php.html#ab33fa9756aaa5f39a6104d57a62baf00":[6,0,0,49,51],
 "items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[6,0,0,49,28],
 "items_8php.html#abeb7886cde44d9a83dbaf2bc4ab18723":[6,0,0,49,8],
 "items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[6,0,0,49,2],
@@ -162,7 +176,8 @@ var NAVTREEINDEX6 =
 "lockview_8php.html":[6,0,1,51],
 "lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[6,0,1,51,0],
 "locs_8php.html":[6,0,1,52],
-"locs_8php.html#a6b43654592919ac863d67a1f787a69b9":[6,0,1,52,0],
+"locs_8php.html#a6b43654592919ac863d67a1f787a69b9":[6,0,1,52,1],
+"locs_8php.html#a6c900f53970c0d0e738d2fe06d27ca44":[6,0,1,52,0],
 "login_8php.html":[6,0,1,53],
 "login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[6,0,1,53,0],
 "lostpass_8php.html":[6,0,1,54],
@@ -234,20 +249,5 @@ var NAVTREEINDEX6 =
 "mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[6,0,1,80,0],
 "mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[6,0,1,80,1],
 "mod_2probe_8php.html":[6,0,1,88],
-"mod_2probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[6,0,1,88,0],
-"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]
+"mod_2probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[6,0,1,88,0]
 };