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

Merge branch 'dev'
---

f7cb8ab28eb23a6aeb3628d2e629ba174467e1ea