aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_func_0x67.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_0x67.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_0x67.html')
-rw-r--r--doc/html/globals_func_0x67.html9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html
index e92d8eabe..12301d1d1 100644
--- a/doc/html/globals_func_0x67.html
+++ b/doc/html/globals_func_0x67.html
@@ -167,12 +167,18 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
<li>get_birthdays()
: <a class="el" href="identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51">identity.php</a>
</li>
+<li>get_bookmark_link()
+: <a class="el" href="include_2bookmarks_8php.html#a743763b0ce83af0bbc8a2f7ac16033aa">bookmarks.php</a>
+</li>
<li>get_browser_language()
: <a class="el" href="language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e">language.php</a>
</li>
<li>get_capath()
: <a class="el" href="include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7">network.php</a>
</li>
+<li>get_channel_by_nick()
+: <a class="el" href="identity_8php.html#ac73b3e13778c564c877554517a7f51ba">identity.php</a>
+</li>
<li>get_cloudpath()
: <a class="el" href="include_2attach_8php.html#a6aa00ea010ea030110faefb75eafc1ce">attach.php</a>
</li>
@@ -221,6 +227,9 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
<li>get_item_elements()
: <a class="el" href="items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361">items.php</a>
</li>
+<li>get_language_name()
+: <a class="el" href="language_8php.html#a43e6ddba9df019c9ac3ab4c94c444ae7">language.php</a>
+</li>
<li>get_mail_elements()
: <a class="el" href="items_8php.html#a94ddb1d6c8fa21dd7433677e85168037">items.php</a>
</li>