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_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_0x6d.html')
| -rw-r--r-- | doc/html/globals_0x6d.html | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/html/globals_0x6d.html b/doc/html/globals_0x6d.html index 28c06d13a..c29a58934 100644 --- a/doc/html/globals_0x6d.html +++ b/doc/html/globals_0x6d.html @@ -195,6 +195,9 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');}); <li>match_content() : <a class="el" href="match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d">match.php</a> </li> +<li>match_openid() +: <a class="el" href="auth_8php.html#ab7be44ee051c0aa29847807cf2c5dd38">auth.php</a> +</li> <li>MAX_IMAGE_LENGTH : <a class="el" href="boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa">boot.php</a> </li> @@ -237,6 +240,9 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');}); <li>menu_fetch_id() : <a class="el" href="include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7">menu.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> @@ -250,7 +256,7 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');}); : <a class="el" href="mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393">menu.php</a> </li> <li>menu_render() -: <a class="el" href="include_2menu_8php.html#a4d7123b0577fa994770199f9b831da11">menu.php</a> +: <a class="el" href="include_2menu_8php.html#a03a5deed3908543581c074ce333e9d6a">menu.php</a> </li> <li>MENU_SYSTEM : <a class="el" href="boot_8php.html#a718a801b0be6cbaef5e519516da12721">boot.php</a> |