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 269a05bffec74bd2cf9ad3e84f9bc20e76b63d5e Merge: 27ffc1f 59e2c4b Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jul 30 17:23:32 2014 +0200 Merge branch 'feature/addChoiceInVote' into develop .../chorem/pollen/services/bean/ChoiceBean.java | 10 + .../pollen/services/service/ChoiceService.java | 14 +- .../pollen/services/service/PollService.java | 16 - .../services/service/security/SecurityService.java | 27 +- .../src/main/webapp/js/controllers/pollCtrl.js | 359 ++++++++++++--------- .../src/main/webapp/partials/inline-poll.html | 16 +- .../src/main/webapp/partials/poll-popupChoice.html | 2 +- 7 files changed, 245 insertions(+), 199 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.