Merge remote-tracking branch 'upstream/master'

Conflicts:
	view/theme/redbasic/tpl/theme_settings.tpl

reset to upstream

1 files changed, 66 insertions, 66 deletions

diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js
index b75aae4bb..9b22977ad 100644
--- a/doc/html/navtreeindex4.js
+++ b/doc/html/navtreeindex4.js
@@ -1,5 +1,30 @@
 var NAVTREEINDEX4 =
 {
+"friendica-to-smarty-tpl_8py.html#a68d15934660cd1f4301ce251b1646f09":[5,0,2,5,12],
+"friendica-to-smarty-tpl_8py.html#a8540514fb7c4aa18ad2dffa2a975036b":[5,0,2,5,14],
+"friendica-to-smarty-tpl_8py.html#a87182a9bab47640428bd0b2b9946bef9":[5,0,2,5,10],
+"friendica-to-smarty-tpl_8py.html#a89388ea9b2826e8218ed480e917d8105":[5,0,2,5,2],
+"friendica-to-smarty-tpl_8py.html#a965e1d6d6293654a56e029a7e454dec7":[5,0,2,5,5],
+"friendica-to-smarty-tpl_8py.html#ad9ef87ccb2c9960501f5e02424a22d80":[5,0,2,5,9],
+"friendica-to-smarty-tpl_8py.html#ae74419b16516956c66f7db714a93a6ac":[5,0,2,5,7],
+"friendica-to-smarty-tpl_8py.html#aecf730e0884bb4ddc6c0deb1ef85f8eb":[5,0,2,5,4],
+"friendica-to-smarty-tpl_8py.html#af6b2c793958aae2aadc294577431f749":[5,0,2,5,3],
+"friendica__smarty_8php.html":[5,0,0,35],
+"fsuggest_8php.html":[5,0,1,38],
+"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,38,1],
+"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,38,0],
+"full_8php.html":[5,0,3,1,2],
+"full_8php.html#a3987f5547ceb7e36a210a66a06241a5a":[5,0,3,1,2,0],
+"functions.html":[4,3,0],
+"functions.html":[4,3,0,0],
+"functions_0x5f.html":[4,3,0,1],
+"functions_0x61.html":[4,3,0,2],
+"functions_0x62.html":[4,3,0,3],
+"functions_0x63.html":[4,3,0,4],
+"functions_0x64.html":[4,3,0,5],
+"functions_0x65.html":[4,3,0,6],
+"functions_0x66.html":[4,3,0,7],
+"functions_0x67.html":[4,3,0,8],
 "functions_0x68.html":[4,3,0,9],
 "functions_0x69.html":[4,3,0,10],
 "functions_0x6c.html":[4,3,0,11],
@@ -11,6 +36,8 @@ var NAVTREEINDEX4 =
 "functions_0x73.html":[4,3,0,17],
 "functions_0x74.html":[4,3,0,18],
 "functions_0x76.html":[4,3,0,19],
+"functions_8php.html":[5,0,3,2,0,1,1],
+"functions_8php.html#adefe514c95680928b3aae250cbc3c663":[5,0,3,2,0,1,1,0],
 "functions_func.html":[4,3,1],
 "functions_func.html":[4,3,1,0],
 "functions_func_0x61.html":[4,3,1,1],
@@ -112,16 +139,16 @@ var NAVTREEINDEX4 =
 "globals_vars_0x7a.html":[5,1,2,21],
 "gprobe_8php.html":[5,0,0,36],
 "gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[5,0,0,36,0],
-"greenthumbnails_8php.html":[5,0,3,2,0,1,3],
-"help_8php.html":[5,0,1,39],
-"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[5,0,1,39,1],
-"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,39,0],
+"greenthumbnails_8php.html":[5,0,3,2,0,2,3],
+"help_8php.html":[5,0,1,40],
+"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[5,0,1,40,1],
+"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,40,0],
 "hierarchy.html":[4,2],
-"home_8php.html":[5,0,1,40],
-"home_8php.html#aa1cf697851a646755baf537f75334c46":[5,0,1,40,0],
-"home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde":[5,0,1,40,1],
-"hostxrd_8php.html":[5,0,1,41],
-"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,41,0],
+"home_8php.html":[5,0,1,41],
+"home_8php.html#aa1cf697851a646755baf537f75334c46":[5,0,1,41,0],
+"home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde":[5,0,1,41,1],
+"hostxrd_8php.html":[5,0,1,42],
+"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,42,0],
 "html2bbcode_8php.html":[5,0,0,38],
 "html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[5,0,0,38,3],
 "html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[5,0,0,38,1],
@@ -134,32 +161,35 @@ var NAVTREEINDEX4 =
 "html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[5,0,0,39,1],
 "identity_8php.html":[5,0,0,40],
 "identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[5,0,0,40,3],
-"identity_8php.html#a332df795f684788002f5a6424abacfd7":[5,0,0,40,9],
+"identity_8php.html#a332df795f684788002f5a6424abacfd7":[5,0,0,40,10],
 "identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,40,2],
-"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,40,12],
-"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,0,40,18],
-"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,0,40,17],
-"identity_8php.html#a47d6f53216f23a3484061793bef29854":[5,0,0,40,19],
-"identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,0,40,7],
-"identity_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,0,40,22],
-"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,0,40,23],
+"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,40,13],
+"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,0,40,19],
+"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,0,40,18],
+"identity_8php.html#a47d6f53216f23a3484061793bef29854":[5,0,0,40,20],
+"identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,0,40,8],
+"identity_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,0,40,23],
+"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,0,40,24],
 "identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,40,1],
-"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,40,20],
-"identity_8php.html#a9637c557e13d9671f3eeb124ab98212a":[5,0,0,40,15],
-"identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,0,40,8],
+"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,40,21],
+"identity_8php.html#a9637c557e13d9671f3eeb124ab98212a":[5,0,0,40,16],
+"identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,0,40,9],
 "identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,40,0],
-"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,0,40,11],
-"identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51":[5,0,0,40,10],
-"identity_8php.html#ab1485a26b032956e1496fc08c58b83ed":[5,0,0,40,5],
-"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,40,13],
+"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,0,40,12],
+"identity_8php.html#aaff86ee3b5984821e7a256c2da5f1a51":[5,0,0,40,11],
+"identity_8php.html#ab1485a26b032956e1496fc08c58b83ed":[5,0,0,40,6],
+"identity_8php.html#ac73b3e13778c564c877554517a7f51ba":[5,0,0,40,5],
+"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,40,14],
 "identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[5,0,0,40,4],
-"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,0,40,16],
-"identity_8php.html#ae2b140df652a55ca11bb6a99005fce35":[5,0,0,40,14],
-"identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,0,40,6],
-"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,40,21],
-"import_8php.html":[5,0,1,42],
-"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,42,1],
-"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,42,0],
+"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,0,40,17],
+"identity_8php.html#ae2b140df652a55ca11bb6a99005fce35":[5,0,0,40,15],
+"identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,0,40,7],
+"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,40,22],
+"import_8php.html":[5,0,1,43],
+"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,43,1],
+"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,43,0],
+"importelm_8php.html":[5,0,1,44],
+"importelm_8php.html#a1a4f71e6d76ace6add5e9659845f5e5f":[5,0,1,44,0],
 "include_2api_8php.html":[5,0,0,5],
 "include_2api_8php.html#a0991f72554f821255397d615e76f3203":[5,0,0,5,12],
 "include_2api_8php.html#a176c448d79c211ad41c2bbe3124658f5":[5,0,0,5,5],
@@ -168,7 +198,7 @@ var NAVTREEINDEX4 =
 "include_2api_8php.html#a2e94eab9d6c164bfef7a1b2ab87b339b":[5,0,0,5,0],
 "include_2api_8php.html#a32f0dda848d0c11c727fe1c3e741c283":[5,0,0,5,44],
 "include_2api_8php.html#a36344c80b8e9755da2f2dd3a0e28cce8":[5,0,0,5,16],
-"include_2api_8php.html#a43c47de8565cc00c3369cb35c19cc75e":[5,0,0,5,49],
+"include_2api_8php.html#a43c47de8565cc00c3369cb35c19cc75e":[5,0,0,5,50],
 "include_2api_8php.html#a450d8732b7b608f7ac929aee61572b95":[5,0,0,5,38],
 "include_2api_8php.html#a4c6fb9fb5203aa60f4b3afd4521db8ea":[5,0,0,5,19],
 "include_2api_8php.html#a528d8070ee74ea800102936ce73cf366":[5,0,0,5,37],
@@ -190,9 +220,10 @@ var NAVTREEINDEX4 =
 "include_2api_8php.html#aa1bddb580510e70cc1a7b7381667f1a3":[5,0,0,5,28],
 "include_2api_8php.html#aa40bae797bcd9ccacffdce5a3b5a1afa":[5,0,0,5,23],
 "include_2api_8php.html#aa49741342ad8ba285737eea1209a37e1":[5,0,0,5,25],
-"include_2api_8php.html#aa62b15a6bbb280e86b98132eb214013d":[5,0,0,5,51],
+"include_2api_8php.html#aa62b15a6bbb280e86b98132eb214013d":[5,0,0,5,52],
 "include_2api_8php.html#aa6fc3bc8c0fad1d081db0dcc456dd77f":[5,0,0,5,29],
 "include_2api_8php.html#aa9dc5350b26d6c7727d6c4b641ecba18":[5,0,0,5,3],
+"include_2api_8php.html#aafa82b65a9f879a1a1197cfe8aaf3898":[5,0,0,5,49],
 "include_2api_8php.html#ab1ecb58954f722444bfe03233345cb1b":[5,0,0,5,17],
 "include_2api_8php.html#abe8e929e93f7ab134b1cb1fb30f19a76":[5,0,0,5,48],
 "include_2api_8php.html#ac2c2b18c426d697d11a830bca146be8a":[5,0,0,5,30],
@@ -208,7 +239,7 @@ var NAVTREEINDEX4 =
 "include_2api_8php.html#ae82608c317421f27446465aa6724733d":[5,0,0,5,20],
 "include_2api_8php.html#ae8f5863e18d69421005c71441c9d99a5":[5,0,0,5,1],
 "include_2api_8php.html#aea2dda92a155f2843a0ca188d8dfdf25":[5,0,0,5,7],
-"include_2api_8php.html#aeb2e7ad00ea666b4b6dfcf82008194f8":[5,0,0,5,50],
+"include_2api_8php.html#aeb2e7ad00ea666b4b6dfcf82008194f8":[5,0,0,5,51],
 "include_2api_8php.html#af6f1d89cdb0a0621025efbec1597bc63":[5,0,0,5,42],
 "include_2api_8php.html#afb99daa6b731bf497b81f2128084852c":[5,0,0,5,47],
 "include_2api_8php.html#afe534f826e4282b72d66e8cadca7bb73":[5,0,0,5,26],
@@ -218,36 +249,5 @@ var NAVTREEINDEX4 =
 "include_2attach_8php.html#a3634af95f11a023dd8e882c3c7a3600d":[5,0,0,6,5],
 "include_2attach_8php.html#a5c0875eafb8c0f8a0620ff7a875a2221":[5,0,0,6,2],
 "include_2attach_8php.html#a5d484de2d19a93071571d6499a50ae34":[5,0,0,6,9],
-"include_2attach_8php.html#a6aa00ea010ea030110faefb75eafc1ce":[5,0,0,6,8],
-"include_2attach_8php.html#a6fdd92775f31c07d2863e16e0026018a":[5,0,0,6,10],
-"include_2attach_8php.html#a70bd666e080c2af5a91f5d14c297b8cd":[5,0,0,6,4],
-"include_2attach_8php.html#a84a8a64c4805e1525b42d4add464833f":[5,0,0,6,7],
-"include_2attach_8php.html#a887d2d44a3ef18dcb6624e7fb58dc8e3":[5,0,0,6,3],
-"include_2attach_8php.html#ab6830b3ab74a5d284876141ac80f6cbc":[5,0,0,6,6],
-"include_2attach_8php.html#ad991208ce939387e2f93a3bce7d09932":[5,0,0,6,1],
-"include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909":[5,0,0,6,11],
-"include_2bookmarks_8php.html":[5,0,0,11],
-"include_2bookmarks_8php.html#a88ce7dee6a3dc7465aa9b8eaa45b0087":[5,0,0,11,0],
-"include_2chanman_8php.html":[5,0,0,13],
-"include_2chanman_8php.html#a21ba9a5c961e866ff27aee3ee67bf99b":[5,0,0,13,0],
-"include_2chat_8php.html":[5,0,0,14],
-"include_2chat_8php.html#a1ee1360f7d2549c7549ae07cb5190f0f":[5,0,0,14,3],
-"include_2chat_8php.html#a2ba3af6884ecdce95de69262fe599639":[5,0,0,14,1],
-"include_2chat_8php.html#a2c95b545e46bfee64faa05ecf0afea91":[5,0,0,14,2],
-"include_2chat_8php.html#acdc80dba4eb796c7472b21129b435422":[5,0,0,14,0],
-"include_2chat_8php.html#aedcb532a0627b8644001a2fadab4e87a":[5,0,0,14,4],
-"include_2config_8php.html":[5,0,0,18],
-"include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1":[5,0,0,18,7],
-"include_2config_8php.html#a549910227348003efc3c05c9105c42da":[5,0,0,18,0],
-"include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33":[5,0,0,18,9],
-"include_2config_8php.html#a61591371cb18764138655d67dc817ab2":[5,0,0,18,11],
-"include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941":[5,0,0,18,1],
-"include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72":[5,0,0,18,2],
-"include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e":[5,0,0,18,6],
-"include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6":[5,0,0,18,8],
-"include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad":[5,0,0,18,5],
-"include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a":[5,0,0,18,10],
-"include_2config_8php.html#af02c96e6b37335774b548914ede1d22e":[5,0,0,18,3],
-"include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74":[5,0,0,18,4],
-"include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e":[5,0,0,18,12]
+"include_2attach_8php.html#a6aa00ea010ea030110faefb75eafc1ce":[5,0,0,6,8]
 };