This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 664769ead59932b11f5c5ff2fedbb2fb917b0a1d Merge: c125003f 7e590b78 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Apr 6 17:09:36 2018 +0200 Merge branch 'feature/198-DuelsNotCombats' into 'develop' Fixes #198 - Vote de Condorcet : Duels et non Combats Closes #198 See merge request chorem/pollen!17 pollen-ui-riot-js/src/main/web/i18n/fr.json | 10 +++++----- .../i18n/pollen-votecounting-condorcet_en_GB.properties | 2 +- .../i18n/pollen-votecounting-condorcet_fr_FR.properties | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.