From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sat, 11 Aug 2018 15:39:01 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=b84916dd6c1bd5db098ecdd86f3f60ce22d1c1d6;hp=b84916dd6c1bd5db098ecdd86f3f60ce22d1c1d6;p=perso%2FImmae%2FProjets%2FPuppet.git

Merge branch 'dev'
---