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

Trivial merge