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

diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js
index ca92c7407..a855bf2c7 100644
--- a/doc/html/navtreeindex3.js
+++ b/doc/html/navtreeindex3.js
@@ -1,5 +1,17 @@
 var NAVTREEINDEX3 =
 {
+"classTemplate.html#a317d535946dc065c35dd5cd38380e6c6":[5,0,25,22],
+"classTemplate.html#a35d599c9b53a02e2fe2232e5b7ed5da7":[5,0,25,2],
+"classTemplate.html#a37c15f6d1ade500943629f27a62808b7":[5,0,25,3],
+"classTemplate.html#a4b933954086d9e01a1804b0b1c6ee93e":[5,0,25,6],
+"classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10":[5,0,25,21],
+"classTemplate.html#a6f0efc256688c36110180b501067ff11":[5,0,25,23],
+"classTemplate.html#a8469ab2988b6be2681516dc4b4e07d38":[5,0,25,15],
+"classTemplate.html#a86e8fd27955ef10cadfd86f3fca70677":[5,0,25,9],
+"classTemplate.html#a8f4d17e49f42b876a97364c13fb572d1":[5,0,25,19],
+"classTemplate.html#aa6a087e0b7b887dd1c98c9e0ecbd3b29":[5,0,25,4],
+"classTemplate.html#aa6f9bd7a8f7512efcf90e8d376fe05ee":[5,0,25,10],
+"classTemplate.html#aac9a4638f11271e1b1dcc9f247242718":[5,0,25,20],
 "classTemplate.html#aae9c4d761ea1298e745e8052d7910194":[5,0,25,1],
 "classTemplate.html#abbc484016ddf5d818f55b823cae6feb0":[5,0,25,14],
 "classTemplate.html#abda4c8d049f70553338eae7c905e9d5c":[5,0,25,17],
@@ -237,17 +249,5 @@ var NAVTREEINDEX3 =
 "diaspora_8php.html#a131abd521b218d6ae6f7d2917d8b2605":[6,0,0,31,15],
 "diaspora_8php.html#a1704748aa2384c73e43f10e71defd31a":[6,0,0,31,25],
 "diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31":[6,0,0,31,14],
-"diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007":[6,0,0,31,19],
-"diaspora_8php.html#a33ae0c4606a7df4d801c05507d87f668":[6,0,0,31,26],
-"diaspora_8php.html#a4901762cba5cd8dcdc57bdf285eefb1b":[6,0,0,31,12],
-"diaspora_8php.html#a586d5a3ba92d35cee14f879f290072aa":[6,0,0,31,17],
-"diaspora_8php.html#a5d57518545baa31cf8a85a937a267681":[6,0,0,31,10],
-"diaspora_8php.html#a5ed66b910d7b0284f9b3ee04e72306ff":[6,0,0,31,7],
-"diaspora_8php.html#a69f250b078a46e405647428ec3399a16":[6,0,0,31,27],
-"diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7":[6,0,0,31,4],
-"diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2":[6,0,0,31,13],
-"diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46":[6,0,0,31,11],
-"diaspora_8php.html#a849754ec369e1a60fadae5c14584ca36":[6,0,0,31,3],
-"diaspora_8php.html#a858f70153c384f8778082cf7843a19da":[6,0,0,31,8],
-"diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f":[6,0,0,31,16]
+"diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007":[6,0,0,31,19]
 };