From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Thu, 21 Dec 2017 15:17:05 +0000 (+0100)
Subject: Merge branch 'v1' into v3
X-Git-Tag: v3.3.0~70
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/wiki/%7B%7B%20url_for%28%27vote_deletechoices%27%2C%20idvote=vote.id%2C%20iduser=session.user.id%29%20%7D%7D?a=commitdiff_plain;h=9dc2b0c479b88635322bebfecd29d16f5c7b5584;p=lhc%2Fweb%2Fwww.git

Merge branch 'v1' into v3
---

9dc2b0c479b88635322bebfecd29d16f5c7b5584