This is an automated email from the git hooks/post-receive script. New change to branch master in repository pollen. See http://git.chorem.org/pollen.git from 613b614 Merge branch 'release/2.0-alpha-2' adds fea63ee [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds dc6fdef Merge branch 'master' into develop adds d302d01 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 86b2cf6 fixes #1100 error on load edit user profile page adds 06e071c fixes #1102: Improve service configuration adds 900395e [jgitflow-maven-plugin]updating poms for branch '2.0-alpha-3' with snapshot versions adds 715dfd6 [jgitflow-maven-plugin]updating poms for branch'release/2.0-alpha-3' with non-snapshot versions adds ba5e600 Merge branch 'release/2.0-alpha-3' No new revisions were added by this update. Summary of changes: pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-rest-api/src/main/resources/pollen-rest-api.properties | 1 - pollen-services/pom.xml | 2 +- .../org/chorem/pollen/services/config/PollenServiceConfig.java | 9 ++------- .../chorem/pollen/services/config/PollenServiceConfigOption.java | 2 +- pollen-ui-angular/pom.xml | 2 +- pollen-ui-angular/src/main/webapp/partials/user-edit.html | 9 +++++---- 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 +- 18 files changed, 22 insertions(+), 27 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.