This is an automated email from the git hooks/post-receive script. New change to branch master in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git from 65d6b4c [jgitflow-maven-plugin]merging 'release/1.5.10' into 'master' adds 96dc837 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 0b1d454 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 200032f [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds a14aa2a Update parent pom adds 728f3b1 fixes #1386: Update struts to 2.3.32 adds 84e7d5c Add <strong> on link adds 3c93a07 Replace invalid "image" tag adds 28b0936 Fix invalid location of html element adds db5fa55 Fix pom.xml headers adds 4514657 [jgitflow-maven-plugin]updating poms for 1.5.11 branch with snapshot versions adds af7e21a [jgitflow-maven-plugin]updating poms for branch'release/1.5.11' with non-snapshot versions adds 87fc016 [jgitflow-maven-plugin]merging 'release/1.5.11' into 'master' No new revisions were added by this update. Summary of changes: 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>.