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

Trivial merge