aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_func_0x61.html
diff options
context:
space:
mode:
authorStefan Parviainen <saparvia@caterva.eu>2014-11-08 20:53:41 +0100
committerStefan Parviainen <saparvia@caterva.eu>2014-11-08 20:53:41 +0100
commitb5fad9feefd0f261807222d8a4c42ead6253a65c (patch)
tree399cd4a1b79f61530924ea59670af0bdd6cee5be /doc/html/globals_func_0x61.html
parent89aea081825ec7b11b00833a9bec2c74900bfcb6 (diff)
parentb29a968be8df52cd7c9b6d5bebb618534788337c (diff)
downloadvolse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.gz
volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.bz2
volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.zip
Fix merge conflict
Diffstat (limited to 'doc/html/globals_func_0x61.html')
-rw-r--r--doc/html/globals_func_0x61.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/html/globals_func_0x61.html b/doc/html/globals_func_0x61.html
index ee7ca7aa7..a7712761a 100644
--- a/doc/html/globals_func_0x61.html
+++ b/doc/html/globals_func_0x61.html
@@ -374,6 +374,9 @@ $(document).ready(function(){initNavTree('globals_func_0x61.html','');});
<li>api_post()
: <a class="el" href="mod_2api_8php.html#a6fe77f05c07cb51048df0d557b4b9bd2">api.php</a>
</li>
+<li>api_red_xchan()
+: <a class="el" href="include_2api_8php.html#a4fe872332ff0bd8d5eae2f0c6819cb60">api.php</a>
+</li>
<li>api_register_func()
: <a class="el" href="include_2api_8php.html#ac2c2b18c426d697d11a830bca146be8a">api.php</a>
</li>