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

Merge branch 'dev'
---

edff34b866f9bc2a52b66f6114871a58c7b41c2d