]> git.immae.eu Git - perso/Immae/Projets/Puppet.git/commitdiff
Merge branch 'dev'
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Mon, 30 Jul 2018 21:22:04 +0000 (23:22 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Mon, 30 Jul 2018 21:22:04 +0000 (23:22 +0200)

Trivial merge