]> granicus.if.org Git - ejabberd/commitdiff
Merge branch 'docker' from Rafael Römhild
authorChristophe Romain <christophe.romain@process-one.net>
Wed, 30 Nov 2016 09:30:19 +0000 (10:30 +0100)
committerChristophe Romain <christophe.romain@process-one.net>
Wed, 30 Nov 2016 09:30:19 +0000 (10:30 +0100)

Trivial merge