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

Merge branch 'dev'
---