From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Thu, 28 Jun 2018 10:49:14 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=85c0bf0d262633f4a153b5662472cc0ed20d41ae;hp=95416ae2301b936829cab964792a8a1e07b06720;p=perso%2FImmae%2FProjets%2FPuppet.git

Merge branch 'dev'
---