aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_func_0x62.html
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-05-29 16:14:10 -0700
committerfriendica <info@friendica.com>2014-05-29 16:14:10 -0700
commit9b5eabf1083602382385c62c6ad7d8ae8e167f9e (patch)
treea73ed07970a517dbad90f14954fea790193813c3 /doc/html/globals_func_0x62.html
parenta00103b7dfa0b128cbe6ab03e6a43ccedb24f8c2 (diff)
parent1a58777daa0ab9394f38737a806a7a185ebceeb0 (diff)
downloadvolse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.gz
volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.tar.bz2
volse-hubzilla-9b5eabf1083602382385c62c6ad7d8ae8e167f9e.zip
Merge branch 'master' into newevent
Conflicts: include/zot.php
Diffstat (limited to 'doc/html/globals_func_0x62.html')
-rw-r--r--doc/html/globals_func_0x62.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/html/globals_func_0x62.html b/doc/html/globals_func_0x62.html
index dbd73fc49..eea71bca0 100644
--- a/doc/html/globals_func_0x62.html
+++ b/doc/html/globals_func_0x62.html
@@ -155,6 +155,9 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');});
<li>bb_location()
: <a class="el" href="bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd">bbcode.php</a>
</li>
+<li>bb_parse_app()
+: <a class="el" href="bbcode_8php.html#abb02f1044ff1c635d12af690d0f2cfa2">bbcode.php</a>
+</li>
<li>bb_parse_crypt()
: <a class="el" href="bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f">bbcode.php</a>
</li>
@@ -219,7 +222,7 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');});
: <a class="el" href="blogga_2view_2theme_2blog_2theme_8php.html#a028ae8e9f2824670dfa76a6651d817e5">theme.php</a>
</li>
<li>blogtheme_form()
-: <a class="el" href="view_2theme_2blogga_2php_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27">config.php</a>
+: <a class="el" href="view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27">config.php</a>
</li>
<li>blogtheme_imgurl()
: <a class="el" href="blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec">theme.php</a>