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

Merge branch 'dev'
---

dec18e81237e7632b4aa300b786c960a4513f74a