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/auth_8php.js | |
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/auth_8php.js')
-rw-r--r-- | doc/html/auth_8php.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/html/auth_8php.js b/doc/html/auth_8php.js index 88b106675..75241485b 100644 --- a/doc/html/auth_8php.js +++ b/doc/html/auth_8php.js @@ -1,6 +1,7 @@ var auth_8php = [ [ "account_verify_password", "auth_8php.html#a07bae0e623e2daa9ee2cd5a8aa294dee", null ], + [ "match_openid", "auth_8php.html#ab7be44ee051c0aa29847807cf2c5dd38", null ], [ "nuke_session", "auth_8php.html#a2add3a1129ffa4d5515442a9d52a9b1a", null ], [ "else", "auth_8php.html#a0950af7c2888ca1d4743fe5d0bff9ae5", null ] ];
\ No newline at end of file |