aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_func_0x63.html
diff options
context:
space:
mode:
authorTony Baldwin <tonybaldwin@gmx.com>2014-03-09 19:22:54 -0400
committerTony Baldwin <tonybaldwin@gmx.com>2014-03-09 19:22:54 -0400
commit5cca00ddc79dad667464674e08a2a860e262eabd (patch)
tree53df980e32a6706e977a5a2276e0f9aa9ec09300 /doc/html/globals_func_0x63.html
parent67166180bb560276273a20bcd9ca2a7aae036aba (diff)
parenta79072ce478a999b06df38ae324fbcef6d3a76e7 (diff)
downloadvolse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.gz
volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.bz2
volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: view/theme/redbasic/tpl/theme_settings.tpl reset to upstream
Diffstat (limited to 'doc/html/globals_func_0x63.html')
-rw-r--r--doc/html/globals_func_0x63.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html
index 01cfcc622..0664d447b 100644
--- a/doc/html/globals_func_0x63.html
+++ b/doc/html/globals_func_0x63.html
@@ -311,8 +311,11 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
<li>comanche_block()
: <a class="el" href="comanche_8php.html#a5a7ab801717d38e91ac910b933973887">comanche.php</a>
</li>
+<li>comanche_get_channel_id()
+: <a class="el" href="comanche_8php.html#aed39ecad69234f3ddf61f0dedb49a58e">comanche.php</a>
+</li>
<li>comanche_menu()
-: <a class="el" href="comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b">comanche.php</a>
+: <a class="el" href="comanche_8php.html#ad5a44e42231759aba1dda49e0490501e">comanche.php</a>
</li>
<li>comanche_parser()
: <a class="el" href="comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922">comanche.php</a>