This is an automated email from the git hooks/post-receive script. New change to branch master in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from dd3cef74 Merge branch 'release/3.1.1' into 'master' adds 22d1976a Merge branch 'release/3.1.1' into 'develop' adds 19ee2010 modification du n° de version et import de celui-ci dans le JS adds c102f0a1 fix #190 adds 52c549cf fix #191 adds ecf29c86 update npm dependencies + fix same ids adds af2f2747 fix gitlab ci release + fix NPE adds d91c51ae fix gitlab ci release adds 9767edac release 3.1.2 success [skip ci] adds a57f38c0 fix gitlab ci release adds 047589c6 fix gitlab ci release adds 38d5e813 release 3.1.2 success [skip ci] adds dc801dd6 fix gitlab ci release adds a5ecf20b release 3.1.2 success [skip ci] adds e5248ff9 Merge branch 'release/3.1.2' No new revisions were added by this update. Summary of changes: .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>.