]> git.immae.eu Git - perso/Immae/Projets/Puppet.git/commitdiff
Merge branch 'dev'
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Wed, 16 May 2018 20:20:22 +0000 (22:20 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Wed, 16 May 2018 20:20:22 +0000 (22:20 +0200)

Trivial merge