From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Wed, 16 May 2018 20:20:22 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=077571f35cc34a96bd05cab31636d17a7fb54cae

Merge branch 'dev'
---

077571f35cc34a96bd05cab31636d17a7fb54cae