]> git.immae.eu Git - perso/Immae/Projets/Puppet.git/commitdiff
Merge branch 'dev'
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Sat, 28 Apr 2018 15:28:55 +0000 (17:28 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Sat, 28 Apr 2018 15:28:55 +0000 (17:28 +0200)

Trivial merge