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 e5248ff9a7e75568ff311758ed32b3a48387bf87 Merge: dd3cef74 a5ecf20b Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 2 17:10:50 2018 +0000 Merge branch 'release/3.1.2' .gitlab-ci.yml | 18 +++++-- CHANGELOG | 15 ++++++ pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- .../pollen/services/service/VoteService.java | 2 +- pollen-ui-riot-js/package.json | 14 +++--- pollen-ui-riot-js/pom.xml | 2 +- pollen-ui-riot-js/src/main/web/i18n/en.json | 2 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 2 +- .../src/main/web/tag/PollenFooter.tag.html | 8 +-- .../main/web/tag/components/HumanInput.tag.html | 8 +-- .../main/web/tag/components/LetterAvatar.tag.html | 8 +-- .../src/main/web/tag/poll/Choice.tag.html | 58 ++++++++++++---------- .../src/main/web/tag/poll/Votes.tag.html | 1 - pollen-ui-riot-js/webpack.config.js | 3 ++ pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-cumulative/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 27 files changed, 102 insertions(+), 67 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.