]> git.immae.eu Git - perso/Immae/Projets/Puppet.git/commitdiff
Merge branch 'dev'
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Thu, 29 Mar 2018 17:59:08 +0000 (19:59 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Thu, 29 Mar 2018 17:59:08 +0000 (19:59 +0200)

Trivial merge