From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Tue, 5 Jun 2018 21:15:32 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=c93847dc9d2f9dea6ed09ce5f0cca479131de86d;hp=-c;p=perso%2FImmae%2FProjets%2FPuppet.git

Merge branch 'dev'
---

c93847dc9d2f9dea6ed09ce5f0cca479131de86d