From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sun, 14 Oct 2018 18:40:52 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=17c3bcf4ae012d8cee294a6291c76ea187d5870b;hp=b08f274f67b8ade7ddb8f092a7ccf3604cd5f4cd

Merge branch 'dev'
---