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

Merge branch 'dev'
---

ed7b09a7b7c88c49e4fddb8cbe49e6a4ce6bce10