]> 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 12:36:43 +0000 (14:36 +0200)
committerChristophe Romain <christophe.romain@process-one.net>
Wed, 2 Aug 2017 12:36:43 +0000 (14:36 +0200)

Trivial merge