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

Merge branch 'etherpad_proxy' into dev
---