]> granicus.if.org Git - ejabberd/commit
Merge branch 'new_queue'
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Fri, 24 Mar 2017 10:27:56 +0000 (13:27 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Fri, 24 Mar 2017 10:27:56 +0000 (13:27 +0300)
commite30d41e5f0be428d4a5f51b764d35040752a344b
treeb614fdf27661edb42f35d7d5ccfc6e83945d08a1
parente1f01f0c8ac41c1604c19512b92ce1f19c416059
parent4b1bdb563ec30075f29f5558208c132a3753e915
Merge branch 'new_queue'

Conflicts:
rebar.config
src/mod_muc_admin.erl
rebar.config
src/ejabberd_app.erl
src/ejabberd_bosh.erl
src/ejabberd_config.erl
src/jlib.erl
src/mod_muc.erl
src/mod_muc_admin.erl
src/mod_muc_room.erl