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

Merge branch 'dev'
---

a91216239a8fac0e5b001d256eaa7afe9df81fb8