]> git.immae.eu Git - perso/Immae/Projets/Puppet.git/commitdiff
Merge branch 'xmpp_report' into dev
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Thu, 22 Mar 2018 12:39:05 +0000 (13:39 +0100)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Thu, 22 Mar 2018 12:39:05 +0000 (13:39 +0100)

Trivial merge