This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 6aaa7488eb02e9a0504572f8cf5464890c47147c Merge: fb8573a 921300a Author: Julien Ruchaud <ruchaud@codelutin.com> Date: Wed May 31 14:05:19 2017 +0200 Merge branch 'develop' of gitlab.nuiton.org:chorem/pollen into develop .../src/main/resources/pollen-rest-api.properties | 1 + .../org/chorem/pollen/services/bean/PollenEntityId.java | 6 ++---- .../org/chorem/pollen/services/service/CommentService.java | 4 +++- .../org/chorem/pollen/services/service/PollService.java | 10 ++++++---- pollen-ui-riot-js/src/main/web/i18n.json | 6 ++++-- pollen-ui-riot-js/src/main/web/js/Poll.js | 4 ++++ pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html | 13 ++++++------- pollen-ui-riot-js/src/main/web/tag/poll/Settings.tag.html | 2 +- 8 files changed, 27 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.