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 56797b336136f5d15186d866e89055b979925e13 Merge: ee49fd5 9f703a7 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 15:04:18 2014 +0200 Merge branch 'feature/editVote' into develop .../pollen/services/service/VoteService.java | 57 +++++++++-------- .../services/service/security/SecurityService.java | 4 ++ pollen-ui-angular/src/main/webapp/i18n/en.js | 3 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 3 + .../src/main/webapp/js/controllers/pollCtrl.js | 72 ++++++++++++++-------- .../src/main/webapp/partials/inline-poll.html | 14 ++--- .../src/main/webapp/partials/poll-list.html | 2 +- 7 files changed, 99 insertions(+), 56 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.