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

Merge branch 'dev'
---

65a3209bbb025138fe0b3f422d54604d63480b61