From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Mon, 25 Jun 2018 22:53:16 +0000 (+0200)
Subject: Merge branch 'etherpad' into dev
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=bcc5318b2e938234fcc93f70d6af21367290c1ce

Merge branch 'etherpad' into dev
---

bcc5318b2e938234fcc93f70d6af21367290c1ce