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

Merge branch 'dev'
---

47e379bfb9f9a25a7fe137d0161fb0759ec134a9