]> granicus.if.org Git - ejabberd/commit
Merge commit 'refs/pull/524/head' of github.com:processone/ejabberd into sasl-api...
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Fri, 25 Mar 2016 15:16:50 +0000 (18:16 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Fri, 25 Mar 2016 15:16:50 +0000 (18:16 +0300)
commit46568fb9596d8203c635477b30c91d2928847dea
treea3aad804b0bcab951f9ebfaf3df1db27c550db7f
parentc7cf95ba9983a3457f5983d09e51f6919a69cb37
parent917d48f30bca65f984c4e1305eefe7266097ff65
Merge commit 'refs/pull/524/head' of github.com:processone/ejabberd into sasl-api-change
18 files changed:
src/cyrsasl.erl
src/cyrsasl_digest.erl
src/cyrsasl_plain.erl
src/ejabberd_auth.erl
src/ejabberd_auth_anonymous.erl
src/ejabberd_auth_external.erl
src/ejabberd_auth_internal.erl
src/ejabberd_auth_ldap.erl
src/ejabberd_auth_odbc.erl
src/ejabberd_auth_pam.erl
src/ejabberd_auth_riak.erl
src/ejabberd_c2s.erl
src/ejabberd_commands.erl
src/ejabberd_oauth.erl
src/ejabberd_web_admin.erl
src/mod_http_api.erl
src/mod_proxy65_stream.erl
src/mod_register_web.erl