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

Merge branch 'dev'
---

625907f0177d335c05c05ae66ae49e20287d14b0