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 7aaf2704d4f84fe20ef8d2b1814fa9babbec0872 Merge: c60060be 664769ea Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Apr 6 17:16:51 2018 +0200 Merge branch 'develop' of gitlab.nuiton.org:chorem/pollen into develop 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>.