]> git.immae.eu Git - perso/Immae/Projets/Puppet.git/commitdiff
Merge branch 'dev'
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Tue, 20 Mar 2018 12:14:41 +0000 (13:14 +0100)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Tue, 20 Mar 2018 12:14:41 +0000 (13:14 +0100)

Trivial merge