]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorEvgeny Khramtsov <ekhramtsov@process-one.net>
Fri, 23 Nov 2018 13:25:02 +0000 (16:25 +0300)
committerEvgeny Khramtsov <ekhramtsov@process-one.net>
Fri, 23 Nov 2018 13:25:02 +0000 (16:25 +0300)

Trivial merge