From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Thu, 28 Jun 2018 10:25:52 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=417ffb62ee8c654bb6d2910edf3fda0552c444fa;hp=7f8d0f89d6e2a93fdff509b4cc443be5819e3dd3;p=perso%2FImmae%2FProjets%2FPuppet.git

Merge branch 'dev'
---