aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x62.html
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-07-02 18:36:39 +0100
committerThomas Willingham <founder@kakste.com>2013-07-02 18:36:39 +0100
commitd1cae2da2abc3a602f682114bc02cce08a7e7578 (patch)
treeef3147f9db85bdde8e26303971a40d86e10bb508 /doc/html/globals_0x62.html
parent33696cc8392daeb08d011aa3b1209f3b121898ea (diff)
parentb86253c655f974920c4d3de0915611a7e66c7336 (diff)
downloadvolse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.tar.gz
volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.tar.bz2
volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc/html/globals_0x62.html')
-rw-r--r--doc/html/globals_0x62.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/html/globals_0x62.html b/doc/html/globals_0x62.html
index 82cac0cdf..0ccd06dfe 100644
--- a/doc/html/globals_0x62.html
+++ b/doc/html/globals_0x62.html
@@ -181,7 +181,7 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');});
: <a class="el" href="event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279">event.php</a>
</li>
<li>best_link_url()
-: <a class="el" href="conversation_8php.html#a32e7750ae6adbfdd1f227f6e89221ce3">conversation.php</a>
+: <a class="el" href="conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7">conversation.php</a>
</li>
<li>breaklines()
: <a class="el" href="html2plain_8php.html#a3214912e3d00cf0a948072daccf16740">html2plain.php</a>
@@ -189,6 +189,9 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');});
<li>build_querystring()
: <a class="el" href="boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e">boot.php</a>
</li>
+<li>build_sync_packet()
+: <a class="el" href="include_2settings_8php.html#ac34e479d27f32b82dd6b33542f81a6a7">settings.php</a>
+</li>
</ul>
</div><!-- contents -->
</div><!-- doc-content -->