]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 15 Jan 2018 10:00:19 +0000 (13:00 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Mon, 15 Jan 2018 10:00:19 +0000 (13:00 +0300)

Trivial merge