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

Merge branch 'dev'
---

ea29cb9e07cf11278c97b74aab0688b04fd90f83