This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 87fc016997f0a0a714fbbbd5e4ea9af7443f3fce Merge: 65d6b4c af7e21a Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 10:58:33 2017 +0100 [jgitflow-maven-plugin]merging 'release/1.5.11' into 'master' pollen-persistence/pom.xml | 23 +++++++++++++++++- pollen-services/pom.xml | 23 +++++++++++++++++- pollen-ui-struts2/pom.xml | 23 +++++++++++++++++- .../webapp/WEB-INF/decorators/layout-default.jsp | 26 ++++++++------------- .../webapp/WEB-INF/jsp/poll/createPoll_choices.jsp | 6 ++--- .../webapp/WEB-INF/jsp/poll/displayDateChoice.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/displayImageChoice.jsp | 2 +- .../WEB-INF/jsp/poll/displayPersonToList.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/displayTextChoice.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/displayVotingList.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/summary.jsp | 11 ++++----- pollen-votecounting-aggregator/pom.xml | 23 +++++++++++++++++- pollen-votecounting-api/pom.xml | 23 +++++++++++++++++- pollen-votecounting-borda/pom.xml | 23 +++++++++++++++++- pollen-votecounting-condorcet/pom.xml | 23 +++++++++++++++++- pollen-votecounting-coombs/pom.xml | 23 +++++++++++++++++- pollen-votecounting-instant-runoff/pom.xml | 23 +++++++++++++++++- pollen-votecounting-normal/pom.xml | 23 +++++++++++++++++- pollen-votecounting-number/pom.xml | 23 +++++++++++++++++- pollen-votecounting-percentage/pom.xml | 23 +++++++++++++++++- pom.xml | 27 +++++++++++++++++++--- 21 files changed, 311 insertions(+), 45 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.