]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Fri, 17 Nov 2017 09:50:38 +0000 (12:50 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Fri, 17 Nov 2017 09:50:38 +0000 (12:50 +0300)

Trivial merge