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 d38aae137d27f8a24e5c667b9a78d3fef4fa8224 Merge: 83ae59d8 5e46d930 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 25 09:36:24 2018 +0200 Merge branch 'feature/183-resultScore' into 'develop' fixes #183 : Les colonnes "Résultats" devraient s'intituler "Score" en Borda, nombre et cumulatif Closes #183 See merge request chorem/pollen!19 pollen-ui-riot-js/src/main/web/i18n/en.json | 4 ++++ pollen-ui-riot-js/src/main/web/i18n/fr.json | 4 ++++ pollen-ui-riot-js/src/main/web/tag/poll/EditVote.tag.html | 4 +++- pollen-ui-riot-js/src/main/web/tag/poll/Results.tag.html | 4 +++- 4 files changed, 14 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.