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_0x6f.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_0x6f.html')
-rw-r--r-- | doc/html/globals_0x6f.html | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/html/globals_0x6f.html b/doc/html/globals_0x6f.html index aeb5a4429..790779373 100644 --- a/doc/html/globals_0x6f.html +++ b/doc/html/globals_0x6f.html @@ -195,6 +195,9 @@ $(document).ready(function(){initNavTree('globals_0x6f.html','');}); <li>online_init() : <a class="el" href="online_8php.html#a80e107c84eb722b0ca11d0413b96f9f7">online.php</a> </li> +<li>openid_content() +: <a class="el" href="openid_8php.html#a9a13827dbcf61ae4e45f0b6b33a88f43">openid.php</a> +</li> <li>opensearch_init() : <a class="el" href="opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9">opensearch.php</a> </li> |