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

Merge branch 'dev'
---

f926f9f7a9971dd4e4b302a2f750f5ccd80a536a