aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_vars_0x70.html
diff options
context:
space:
mode:
authortony baldwin <tony@tonybaldwin.org>2014-04-12 08:37:56 -0400
committertony baldwin <tony@tonybaldwin.org>2014-04-12 08:37:56 -0400
commitebd33b185da1c36e718dfa4a2971c3db35cbda22 (patch)
treec23cbf55aac433c90ac254d0684dabf9d4528133 /doc/html/globals_vars_0x70.html
parent5cca00ddc79dad667464674e08a2a860e262eabd (diff)
parentd0834c7e1394e1986b2b00e039125deff74d9e5e (diff)
downloadvolse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.gz
volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.bz2
volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: view/theme/redbasic/css/style.css whatever
Diffstat (limited to 'doc/html/globals_vars_0x70.html')
-rw-r--r--doc/html/globals_vars_0x70.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/html/globals_vars_0x70.html b/doc/html/globals_vars_0x70.html
index 386e55759..81ba6314c 100644
--- a/doc/html/globals_vars_0x70.html
+++ b/doc/html/globals_vars_0x70.html
@@ -151,6 +151,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x70.html','');});
<li>PAGE_AUTOCONNECT
: <a class="el" href="boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9">boot.php</a>
</li>
+<li>PAGE_CENSORED
+: <a class="el" href="boot_8php.html#a36003bebe4ce860c6652bcc3e09b2214">boot.php</a>
+</li>
<li>PAGE_DIRECTORY_CHANNEL
: <a class="el" href="boot_8php.html#a5b8484922918946d041e5e0515dbe718">boot.php</a>
</li>