aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_func_0x6d.html
diff options
context:
space:
mode:
authorTony Baldwin <tonybaldwin@gmx.com>2014-03-09 19:22:54 -0400
committerTony Baldwin <tonybaldwin@gmx.com>2014-03-09 19:22:54 -0400
commit5cca00ddc79dad667464674e08a2a860e262eabd (patch)
tree53df980e32a6706e977a5a2276e0f9aa9ec09300 /doc/html/globals_func_0x6d.html
parent67166180bb560276273a20bcd9ca2a7aae036aba (diff)
parenta79072ce478a999b06df38ae324fbcef6d3a76e7 (diff)
downloadvolse-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_func_0x6d.html')
-rw-r--r--doc/html/globals_func_0x6d.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/html/globals_func_0x6d.html b/doc/html/globals_func_0x6d.html
index 5073bad22..50ebb053c 100644
--- a/doc/html/globals_func_0x6d.html
+++ b/doc/html/globals_func_0x6d.html
@@ -176,6 +176,9 @@ $(document).ready(function(){initNavTree('globals_func_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>member_of()
: <a class="el" href="include_2group_8php.html#a048f6892bfd28852de1b76470df411de">group.php</a>
</li>
@@ -216,7 +219,7 @@ $(document).ready(function(){initNavTree('globals_func_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>message_content()
: <a class="el" href="mod_2message_8php.html#ac72dfed3ce08fcb331d66b37edc6e15f">message.php</a>