]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd 17.12
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Thu, 28 Dec 2017 18:37:19 +0000 (21:37 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Thu, 28 Dec 2017 18:37:19 +0000 (21:37 +0300)

Trivial merge