diff options
| author | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
|---|---|---|
| committer | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
| commit | 5cca00ddc79dad667464674e08a2a860e262eabd (patch) | |
| tree | 53df980e32a6706e977a5a2276e0f9aa9ec09300 /doc/html/globals_vars_0x6d.html | |
| parent | 67166180bb560276273a20bcd9ca2a7aae036aba (diff) | |
| parent | a79072ce478a999b06df38ae324fbcef6d3a76e7 (diff) | |
| download | volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.gz volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.bz2 volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/tpl/theme_settings.tpl
reset to upstream
Diffstat (limited to 'doc/html/globals_vars_0x6d.html')
| -rw-r--r-- | doc/html/globals_vars_0x6d.html | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/html/globals_vars_0x6d.html b/doc/html/globals_vars_0x6d.html index b67fde2da..b6da098d2 100644 --- a/doc/html/globals_vars_0x6d.html +++ b/doc/html/globals_vars_0x6d.html @@ -166,6 +166,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x6d.html','');}); <li>MENU_BOOKMARK : <a class="el" href="boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e">boot.php</a> </li> +<li>MENU_ITEM_CHATROOM +: <a class="el" href="boot_8php.html#af6b3de425e5849c73370a484c44607a3">boot.php</a> +</li> <li>MENU_ITEM_NEWWIN : <a class="el" href="boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5">boot.php</a> </li> |