From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sun, 11 Nov 2018 09:19:30 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=d2f44681018c172f33ea63e893fbe0cfb5ed3289

Merge branch 'dev'
---

d2f44681018c172f33ea63e893fbe0cfb5ed3289