aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x73.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_0x73.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_0x73.html')
-rw-r--r--doc/html/globals_0x73.html8
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html
index 014205a9e..03522e36b 100644
--- a/doc/html/globals_0x73.html
+++ b/doc/html/globals_0x73.html
@@ -325,7 +325,7 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
: <a class="el" href="boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6">boot.php</a>
</li>
<li>store_diaspora_comment_sig()
-: <a class="el" href="items_8php.html#af0a887050dc8d0f51c89890cdaf3145f">items.php</a>
+: <a class="el" href="items_8php.html#a25221826fa4621f523c68483e3b6af26">items.php</a>
</li>
<li>store_item_tag()
: <a class="el" href="taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd">taxonomy.php</a>
@@ -351,9 +351,15 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
<li>stripdcode_br_cb()
: <a class="el" href="bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93">bb2diaspora.php</a>
</li>
+<li>stumble_init()
+: <a class="el" href="stumble_2php_2theme_8php.html#a71db9eff6289e0ee47771c37c01d6753">theme.php</a>
+</li>
<li>subthread_content()
: <a class="el" href="subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3">subthread.php</a>
</li>
+<li>suckerberg_init()
+: <a class="el" href="suckerberg_2php_2theme_8php.html#a4104fce7d5fb71d15ed811978b628fc8">theme.php</a>
+</li>
<li>suggest_content()
: <a class="el" href="suggest_8php.html#a58748a8235d4523f8333847f3e42dd91">suggest.php</a>
</li>