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

Merge branch 'dev'
---

2fb13974804a0ef311f53fd31c0515181d37b37f