granicus.if.org Git - ejabberd/commit

]> granicus.if.org Git - ejabberd/commit

author	Evgeniy Khramtsov <ekhramtsov@process-one.net>
	Sat, 12 Nov 2016 10:27:15 +0000 (13:27 +0300)
committer	Evgeniy Khramtsov <ekhramtsov@process-one.net>
	Sat, 12 Nov 2016 10:27:15 +0000 (13:27 +0300)
commit	78a44e01762e00102f5e3e3f0b49690cc7866c31
tree	b8ac7773f510ee3c1da4802bce2badc71c34c0b2	tree \| snapshot
parent	e841a6ec34e4b79adbeb070e56edec766adc9987	commit \| diff
parent	bd060bc1bb0b5078ddc00189556256418cac1a6f	commit \| diff

Merge branch 'master' into xml-ng

Conflicts:
src/adhoc.erl
src/cyrsasl_oauth.erl
src/ejabberd_c2s.erl
src/ejabberd_config.erl
src/ejabberd_service.erl
src/gen_mod.erl
src/mod_admin_extra.erl
src/mod_announce.erl
src/mod_carboncopy.erl
src/mod_client_state.erl
src/mod_configure.erl
src/mod_echo.erl
src/mod_mam.erl
src/mod_muc.erl
src/mod_muc_room.erl
src/mod_offline.erl
src/mod_pubsub.erl
src/mod_stats.erl
src/node_flat_sql.erl
src/randoms.erl

53 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
include/mod_muc_room.hrl	diff1 \|	diff2 \|	blob \| history
include/ns.hrl	diff1 \|	diff2 \|	blob \| history
include/xmpp_codec.hrl	diff1 \|	\|	blob \| history
specs/xmpp_codec.spec	diff1 \|	diff2 \|	blob \| history
src/acl.erl	diff1 \|	diff2 \|	blob \| history
src/cyrsasl_oauth.erl	diff1 \|	diff2 \|	blob \| history
src/cyrsasl_scram.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_app.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_c2s.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_http.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_http_bind.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_http_ws.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_local.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_oauth.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_s2s.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_s2s_out.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_service.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_sm.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_sm_redis.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_sql.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_web_admin.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_xmlrpc.erl	diff1 \|	diff2 \|	blob \| history
src/jid.erl	diff1 \|	diff2 \|	blob \| history
src/jlib.erl	diff1 \|	diff2 \|	blob \| history
src/mod_admin_extra.erl	diff1 \|	diff2 \|	blob \| history
src/mod_announce.erl	diff1 \|	diff2 \|	blob \| history
src/mod_carboncopy.erl	diff1 \|	diff2 \|	blob \| history
src/mod_client_state.erl	diff1 \|	diff2 \|	blob \| history
src/mod_configure.erl	diff1 \|	diff2 \|	blob \| history
src/mod_delegation.erl	\|	diff2 \|	blob \| history
src/mod_echo.erl	diff1 \|	diff2 \|	blob \| history
src/mod_http_api.erl	diff1 \|	diff2 \|	blob \| history
src/mod_http_upload_quota.erl	diff1 \|	diff2 \|	blob \| history
src/mod_irc.erl	diff1 \|	diff2 \|	blob \| history
src/mod_mam.erl	diff1 \|	diff2 \|	blob \| history
src/mod_mix.erl	diff1 \|	diff2 \|	blob \| history
src/mod_muc.erl	diff1 \|	diff2 \|	blob \| history
src/mod_muc_admin.erl	diff1 \|	diff2 \|	blob \| history
src/mod_muc_log.erl	diff1 \|	diff2 \|	blob \| history
src/mod_muc_room.erl	diff1 \|	diff2 \|	blob \| history
src/mod_offline.erl	diff1 \|	diff2 \|	blob \| history
src/mod_offline_sql.erl	diff1 \|	diff2 \|	blob \| history
src/mod_privacy_sql.erl	diff1 \|	diff2 \|	blob \| history
src/mod_privilege.erl	\|	diff2 \|	blob \| history
src/mod_pubsub.erl	diff1 \|	diff2 \|	blob \| history
src/mod_roster.erl	diff1 \|	diff2 \|	blob \| history
src/mod_stats.erl	diff1 \|	diff2 \|	blob \| history
src/node_flat_sql.erl	diff1 \|	diff2 \|	blob \| history
src/node_mb.erl	diff1 \|	diff2 \|	blob \| history
src/nodetree_tree_sql.erl	diff1 \|	diff2 \|	blob \| history
src/xmpp_codec.erl	diff1 \|	\|	blob \| history
src/xmpp_util.erl	diff1 \|	\|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Makefile.in	diff1 \|	diff2 \|	blob \| history
include/mod_muc_room.hrl	diff1 \|	diff2 \|	blob \| history
include/ns.hrl	diff1 \|	diff2 \|	blob \| history
include/xmpp_codec.hrl	diff1 \|	\|	blob \| history
specs/xmpp_codec.spec	diff1 \|	diff2 \|	blob \| history
src/acl.erl	diff1 \|	diff2 \|	blob \| history
src/cyrsasl_oauth.erl	diff1 \|	diff2 \|	blob \| history
src/cyrsasl_scram.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_app.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_c2s.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_http.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_http_bind.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_http_ws.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_local.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_oauth.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_s2s.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_s2s_out.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_service.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_sm.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_sm_redis.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_sql.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_web_admin.erl	diff1 \|	diff2 \|	blob \| history
src/ejabberd_xmlrpc.erl	diff1 \|	diff2 \|	blob \| history
src/jid.erl	diff1 \|	diff2 \|	blob \| history
src/jlib.erl	diff1 \|	diff2 \|	blob \| history
src/mod_admin_extra.erl	diff1 \|	diff2 \|	blob \| history
src/mod_announce.erl	diff1 \|	diff2 \|	blob \| history
src/mod_carboncopy.erl	diff1 \|	diff2 \|	blob \| history
src/mod_client_state.erl	diff1 \|	diff2 \|	blob \| history
src/mod_configure.erl	diff1 \|	diff2 \|	blob \| history
src/mod_delegation.erl	\|	diff2 \|	blob \| history
src/mod_echo.erl	diff1 \|	diff2 \|	blob \| history
src/mod_http_api.erl	diff1 \|	diff2 \|	blob \| history
src/mod_http_upload_quota.erl	diff1 \|	diff2 \|	blob \| history
src/mod_irc.erl	diff1 \|	diff2 \|	blob \| history
src/mod_mam.erl	diff1 \|	diff2 \|	blob \| history
src/mod_mix.erl	diff1 \|	diff2 \|	blob \| history
src/mod_muc.erl	diff1 \|	diff2 \|	blob \| history
src/mod_muc_admin.erl	diff1 \|	diff2 \|	blob \| history
src/mod_muc_log.erl	diff1 \|	diff2 \|	blob \| history
src/mod_muc_room.erl	diff1 \|	diff2 \|	blob \| history
src/mod_offline.erl	diff1 \|	diff2 \|	blob \| history
src/mod_offline_sql.erl	diff1 \|	diff2 \|	blob \| history
src/mod_privacy_sql.erl	diff1 \|	diff2 \|	blob \| history
src/mod_privilege.erl	\|	diff2 \|	blob \| history
src/mod_pubsub.erl	diff1 \|	diff2 \|	blob \| history
src/mod_roster.erl	diff1 \|	diff2 \|	blob \| history
src/mod_stats.erl	diff1 \|	diff2 \|	blob \| history
src/node_flat_sql.erl	diff1 \|	diff2 \|	blob \| history
src/node_mb.erl	diff1 \|	diff2 \|	blob \| history
src/nodetree_tree_sql.erl	diff1 \|	diff2 \|	blob \| history
src/xmpp_codec.erl	diff1 \|	\|	blob \| history
src/xmpp_util.erl	diff1 \|	\|	blob \| history