From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Tue, 13 Mar 2018 10:18:27 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ca4a52d503d433064019e234212fcf7c211761fe;hp=ca4a52d503d433064019e234212fcf7c211761fe;p=perso%2FImmae%2FProjets%2FPuppet.git

Merge branch 'dev'
---