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

Merge branch 'dev'
---

54460a893b4266d88fe23eb114a5b4e8a5b79077