This is an automated email from the git hooks/post-receive script. New change to branch master in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from 286011d Merge branch 'release/1.5.7' adds efb69b2 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds ef7bfd3 Merge branch 'master' into develop adds 71b81ab [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds f8a65c7 fixes #1138: Some errors happens after updating to struts2 version to 2.3.15.3 adds 55decce fixes #1139: Make poll public result by default adds adc387b fixes #1140: Fix configuration site page adds 4babc07 [jgitflow-maven-plugin]updating poms for branch '1.5.8' with snapshot versions adds ad55921 [jgitflow-maven-plugin]updating poms for branch'release/1.5.8' with non-snapshot versions adds 60ccaf5 Merge branch 'release/1.5.8' No new revisions were added by this update. Summary of changes: pollen-persistence/pom.xml | 2 +- .../src/main/java/org/chorem/pollen/PollenConfiguration.java | 6 ++++++ .../src/main/java/org/chorem/pollen/PollenConfigurationOption.java | 7 +++++++ .../src/main/resources/i18n/pollen-persistence_en_GB.properties | 1 + .../src/main/resources/i18n/pollen-persistence_fr_FR.properties | 1 + pollen-services/pom.xml | 2 +- .../src/main/java/org/chorem/pollen/services/impl/PollService.java | 1 + pollen-ui-struts2/pom.xml | 2 +- pollen-ui-struts2/src/main/resources/struts.xml | 3 +++ .../src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp | 2 +- pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp | 6 +++--- .../src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp | 2 +- pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp | 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 +- src/site/fr/rst/configure.rst | 2 +- src/site/rst/configure.rst | 2 +- 31 files changed, 46 insertions(+), 27 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.