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

Trivial merge