From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Tue, 5 Jun 2018 18:34:38 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=557aacdd327bddae3147eeacee3ba5d54afc020a

Merge branch 'dev'
---

557aacdd327bddae3147eeacee3ba5d54afc020a