From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sat, 14 Jul 2018 09:35:36 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=3423c1f054e5ca4f365c02acc6b49c9d9782aa65;hp=220496056eb730f204f9d21d61d10d41d876c5a1

Merge branch 'dev'
---