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

Merge branch 'dev'
---

2b056b37147c03869f1ca0a2f7909b1a9644c60c