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 0d7838eb22f7376b6e17398d168574b7f214aa3a Merge: d49640ee 578cde0c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Nov 7 14:44:36 2017 +0100 Merge branch 'hotfix/3.0.3' pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- .../pollen/services/service/FeedbackService.java | 1 + .../services/service/NotificationService.java | 23 ++++++++++ .../services/service/PollenServiceSupport.java | 5 +++ .../pollen/services/service/mail/EmailService.java | 49 +++++----------------- pollen-ui-riot-js/package.json | 2 +- 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 +- 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-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 2 +- 21 files changed, 57 insertions(+), 55 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.