From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sun, 13 May 2018 22:57:17 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=402a0538e2146b9614d8094cce8dfd5cc6c603ff

Merge branch 'dev'
---

402a0538e2146b9614d8094cce8dfd5cc6c603ff