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

Merge branch 'dev'
---

e122c6b1ca829844247fbe43f63c74f3f589554f