aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x70.html
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-03-28 21:16:25 +0000
committerThomas Willingham <founder@kakste.com>2013-03-28 21:16:25 +0000
commitfbb4dc69c6789a04f8464afba4ea625feb880731 (patch)
tree47c746b9115d30c4ac3e686022fa497238ac68eb /doc/html/globals_0x70.html
parentc8852d455e77624baf9e6ac852c1176f45462e70 (diff)
parentd0bf45972135bde9ac39a06c6fa5eb64d075a225 (diff)
downloadvolse-hubzilla-fbb4dc69c6789a04f8464afba4ea625feb880731.tar.gz
volse-hubzilla-fbb4dc69c6789a04f8464afba4ea625feb880731.tar.bz2
volse-hubzilla-fbb4dc69c6789a04f8464afba4ea625feb880731.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc/html/globals_0x70.html')
-rw-r--r--doc/html/globals_0x70.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html
index 23b14d451..d8b82f9a7 100644
--- a/doc/html/globals_0x70.html
+++ b/doc/html/globals_0x70.html
@@ -158,6 +158,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
<li>page_content()
: <a class="el" href="page_8php.html#a91a5f649f68406149108bded1dc90b22">page.php</a>
</li>
+<li>PAGE_DIRECTORY_CHANNEL
+: <a class="el" href="boot_8php.html#a5b8484922918946d041e5e0515dbe718">boot.php</a>
+</li>
<li>PAGE_HIDDEN
: <a class="el" href="boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640">boot.php</a>
</li>
@@ -360,7 +363,7 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
: <a class="el" href="conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c">conversation.php</a>
</li>
<li>prepare_text()
-: <a class="el" href="text_8php.html#a70c59f9fde874ef711390d48b407d7ef">text.php</a>
+: <a class="el" href="text_8php.html#afe54312607d92f7ce9593f5760831f80">text.php</a>
</li>
<li>pretheme_init()
: <a class="el" href="pretheme_8php.html#af5660943ee99db5fd75182316522eafe">pretheme.php</a>