]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'master' of github.com:processone/ejabberd
authorChristophe Romain <christophe.romain@process-one.net>
Wed, 2 Aug 2017 10:25:50 +0000 (12:25 +0200)
committerChristophe Romain <christophe.romain@process-one.net>
Wed, 2 Aug 2017 10:25:50 +0000 (12:25 +0200)

Trivial merge