From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sun, 1 Apr 2018 09:09:01 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=9d3cf3e343bfea76cc2af85fe66fba514fe48570;hp=acaa9ea9b08b2cb4783194b0f06b494c1aabe9c1;p=perso%2FImmae%2FProjets%2FPuppet.git

Merge branch 'dev'
---