From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Mon, 14 May 2018 19:14:31 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=e95c59aa9bf09f4f277e17792f4bee57c4c9a2bd

Merge branch 'dev'
---

e95c59aa9bf09f4f277e17792f4bee57c4c9a2bd