This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit ba5e6006c6756dcc0b8cab3692916f50ab7ae166 Merge: 613b614 715dfd6 Author: Maven Release <maven-release@codelutin.com> Date: Sat Aug 30 14:00:01 2014 +0200 Merge branch 'release/2.0-alpha-3' 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>.