aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x64.html
diff options
context:
space:
mode:
authorThomas Willingham <beardyunixer@beardyunixer.com>2014-09-09 21:32:25 +0100
committerThomas Willingham <beardyunixer@beardyunixer.com>2014-09-09 21:32:25 +0100
commitec4f30c3f672bbfc57bee8db0aaa0cf002fe8687 (patch)
treecf1aa37d881f2ce3cb844bbcd5c11c5999e96c66 /doc/html/globals_0x64.html
parent652ec8c3fcc956c1a5fc2adb7410e4c4a2ac6f90 (diff)
parent409c89d629993b59eaafa8443ae9d0b5f0344c1f (diff)
downloadvolse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.tar.gz
volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.tar.bz2
volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc/html/globals_0x64.html')
-rw-r--r--doc/html/globals_0x64.html6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/html/globals_0x64.html b/doc/html/globals_0x64.html
index 679a4f838..c0dfc77fa 100644
--- a/doc/html/globals_0x64.html
+++ b/doc/html/globals_0x64.html
@@ -258,6 +258,9 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
<li>diaspora_like()
: <a class="el" href="diaspora_8php.html#a5d57518545baa31cf8a85a937a267681">diaspora.php</a>
</li>
+<li>diaspora_mention_callback()
+: <a class="el" href="bb2diaspora_8php.html#a4a27604f0745f1efda672966aaca9a3b">bb2diaspora.php</a>
+</li>
<li>diaspora_message()
: <a class="el" href="diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46">diaspora.php</a>
</li>
@@ -378,6 +381,9 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
<li>dirsearch_init()
: <a class="el" href="dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752">dirsearch.php</a>
</li>
+<li>discover_by_url()
+: <a class="el" href="include_2network_8php.html#a5176176ddc1906d91f186df6fbd87b48">network.php</a>
+</li>
<li>discover_by_webbie()
: <a class="el" href="include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe">network.php</a>
</li>