]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' into mix
authorEvgeny Khramtsov <ekhramtsov@process-one.net>
Mon, 10 Dec 2018 08:57:04 +0000 (11:57 +0300)
committerEvgeny Khramtsov <ekhramtsov@process-one.net>
Mon, 10 Dec 2018 08:57:04 +0000 (11:57 +0300)
1  2 
rebar.config
src/ejabberd_sm.erl

diff --cc rebar.config
Simple merge
Simple merge