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 87fc016 [jgitflow-maven-plugin]merging 'release/1.5.11' into 'master' adds 7cfdbd1 [jgitflow-maven-plugin]updating poms for 1.6-SNAPSHOT development adds f84eaec [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 3ea89f1 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 7667843 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 5a025da fixes #1388: Create poll form broken since struts 2.3.32 update adds 44680e4 Update header adds 663295a [jgitflow-maven-plugin]updating poms for 1.5.12 branch with snapshot versions adds 728d6cf [jgitflow-maven-plugin]updating poms for branch'release/1.5.12' with non-snapshot versions adds 49cd2fd [jgitflow-maven-plugin]merging 'release/1.5.12' into 'master' No new revisions were added by this update. Summary of changes: pollen-persistence/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-struts2/pom.xml | 2 +- .../resources/template/jquery/theme.properties | 39 ++++++++++++++++++++++ .../src/main/webapp/js/ckeditor.config.js | 3 +- pollen-ui-struts2/src/main/webapp/js/createPoll.js | 8 ++--- 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 | 4 +-- 16 files changed, 59 insertions(+), 19 deletions(-) create mode 100644 pollen-ui-struts2/src/main/resources/template/jquery/theme.properties -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.