From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Thu, 26 Jul 2018 11:23:58 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=dad86ebc278becc47b67c2ce29acd4147b3317d5

Merge branch 'dev'
---

dad86ebc278becc47b67c2ce29acd4147b3317d5