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

Merge branch 'dev'
---

aeffdda7b8b795cc60053ff34e62dc40c34686ab