From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sat, 28 Apr 2018 13:15:44 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=59e6672eaacaa29a5f5372c39dcd6a2fd9078e46

Merge branch 'dev'
---

59e6672eaacaa29a5f5372c39dcd6a2fd9078e46