aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x72.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_0x72.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_0x72.html')
-rw-r--r--doc/html/globals_0x72.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/html/globals_0x72.html b/doc/html/globals_0x72.html
index 5b121bb7d..c75ab9eec 100644
--- a/doc/html/globals_0x72.html
+++ b/doc/html/globals_0x72.html
@@ -198,6 +198,9 @@ $(document).ready(function(){initNavTree('globals_0x72.html','');});
<li>red_zrl_callback()
: <a class="el" href="items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b">items.php</a>
</li>
+<li>red_zrlify_img_callback()
+: <a class="el" href="items_8php.html#a78a60e39f6991bd3324a24dcbf9dac5a">items.php</a>
+</li>
<li>redbasic_form()
: <a class="el" href="view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793">config.php</a>
</li>