From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Mon, 14 May 2018 19:14:31 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=e95c59aa9bf09f4f277e17792f4bee57c4c9a2bd;hp=5a24a774d45dd0c550b1eee570d184a88e6bbd14;p=perso%2FImmae%2FProjets%2FPuppet.git

Merge branch 'dev'
---