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

Merge branch 'dev'
---

72a1f3073046fa5862cc23e5934694af21a97db0