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 5b16256e Merge branch 'release/3.3.14' adds e87c9a09 Merge tag '3.3.14' into develop adds 09916f90 refs #361 :bug: Après un ajout de choix sur un jugement majoritaire, les résultats ne s'affichent plus adds 698ffad0 Merge branch 'feature/361-BugJugementMajoritaire' into 'develop' adds 147cc157 release 3.3.15 success [skip ci] adds 0c33bbdc Merge branch 'release/3.3.15' No new revisions were added by this update. Summary of changes: CHANGELOG | 5 ++ pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-riot-js/package-lock.json | 2 +- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- 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 +- .../votecounting/MajorityJudgmentChoiceResult.java | 20 ++++++ .../MajorityJudgmentVoteCountingStrategy.java | 12 +++- .../MajorityJudgmentVoteCountingStrategyTest.java | 74 ++++++++++++++++++++-- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 121 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.