Merge remote-tracking branch 'upstream/master' into bootstrap

Conflicts:
	view/php/theme_init.php

1 files changed, 3 insertions, 9 deletions

diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
index 409993767..b95fe1e8e 100644
--- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
+++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
@@ -3,7 +3,6 @@ var dir_d41ce877eb409a4791b288730010abe2 =
     [ "_well_known.php", "__well__known_8php.html", "__well__known_8php" ],
     [ "acl.php", "acl_8php.html", "acl_8php" ],
     [ "admin.php", "admin_8php.html", "admin_8php" ],
-    [ "allfriends.php", "allfriends_8php.html", "allfriends_8php" ],
     [ "api.php", "mod_2api_8php.html", "mod_2api_8php" ],
     [ "apps.php", "apps_8php.html", "apps_8php" ],
     [ "attach.php", "mod_2attach_8php.html", "mod_2attach_8php" ],
@@ -16,8 +15,8 @@ var dir_d41ce877eb409a4791b288730010abe2 =
     [ "community.php", "community_8php.html", "community_8php" ],
     [ "connect.php", "connect_8php.html", "connect_8php" ],
     [ "connections.php", "connections_8php.html", "connections_8php" ],
+    [ "connedit.php", "connedit_8php.html", "connedit_8php" ],
     [ "contactgroup.php", "contactgroup_8php.html", "contactgroup_8php" ],
-    [ "crepair.php", "crepair_8php.html", "crepair_8php" ],
     [ "delegate.php", "delegate_8php.html", "delegate_8php" ],
     [ "directory.php", "mod_2directory_8php.html", "mod_2directory_8php" ],
     [ "dirsearch.php", "dirsearch_8php.html", "dirsearch_8php" ],
@@ -35,15 +34,12 @@ var dir_d41ce877eb409a4791b288730010abe2 =
     [ "follow.php", "mod_2follow_8php.html", "mod_2follow_8php" ],
     [ "fsuggest.php", "fsuggest_8php.html", "fsuggest_8php" ],
     [ "group.php", "mod_2group_8php.html", "mod_2group_8php" ],
-    [ "hcard.php", "hcard_8php.html", "hcard_8php" ],
     [ "help.php", "help_8php.html", "help_8php" ],
-    [ "home.php", "home_8php.html", null ],
+    [ "home.php", "home_8php.html", "home_8php" ],
     [ "hostxrd.php", "hostxrd_8php.html", "hostxrd_8php" ],
     [ "import.php", "import_8php.html", "import_8php" ],
-    [ "intro.php", "intro_8php.html", "intro_8php" ],
     [ "invite.php", "invite_8php.html", "invite_8php" ],
     [ "item.php", "item_8php.html", "item_8php" ],
-    [ "lastpost.php", "lastpost_8php.html", "lastpost_8php" ],
     [ "layouts.php", "layouts_8php.html", "layouts_8php" ],
     [ "like.php", "like_8php.html", "like_8php" ],
     [ "lockview.php", "lockview_8php.html", "lockview_8php" ],
@@ -59,7 +55,7 @@ var dir_d41ce877eb409a4791b288730010abe2 =
     [ "msearch.php", "msearch_8php.html", "msearch_8php" ],
     [ "network.php", "mod_2network_8php.html", "mod_2network_8php" ],
     [ "new_channel.php", "new__channel_8php.html", "new__channel_8php" ],
-    [ "nogroup.php", "nogroup_8php.html", "nogroup_8php" ],
+    [ "notes.php", "notes_8php.html", "notes_8php" ],
     [ "notifications.php", "notifications_8php.html", "notifications_8php" ],
     [ "notify.php", "mod_2notify_8php.html", "mod_2notify_8php" ],
     [ "oembed.php", "mod_2oembed_8php.html", "mod_2oembed_8php" ],
@@ -81,9 +77,7 @@ var dir_d41ce877eb409a4791b288730010abe2 =
     [ "profiles.php", "profiles_8php.html", "profiles_8php" ],
     [ "profperm.php", "profperm_8php.html", "profperm_8php" ],
     [ "pubsites.php", "pubsites_8php.html", "pubsites_8php" ],
-    [ "qsearch.php", "qsearch_8php.html", "qsearch_8php" ],
     [ "randprof.php", "randprof_8php.html", "randprof_8php" ],
-    [ "redir.php", "redir_8php.html", "redir_8php" ],
     [ "register.php", "register_8php.html", "register_8php" ],
     [ "regmod.php", "regmod_8php.html", "regmod_8php" ],
     [ "removeme.php", "removeme_8php.html", "removeme_8php" ],