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

Merge branch 'dev'
---

edc75bd27e4e784f864b67dcc5ec460d512ed4da