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 18a61096f62c53b532e61b7e69d8b657817c85ce Merge: c3efed1b bea5382f Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Wed Sep 6 18:28:27 2017 +0200 Merge branch 'develop' of gitlab.nuiton.org:chorem/pollen into develop .../rest/api/PollenRestApiRequestFilter.java | 24 +- pollen-ui-riot-js/src/main/web/i18n.json | 1063 -------------------- pollen-ui-riot-js/src/main/web/i18n/en.json | 536 ++++++++++ pollen-ui-riot-js/src/main/web/i18n/fr.json | 536 ++++++++++ pollen-ui-riot-js/src/main/web/js/FetchService.js | 5 +- pollen-ui-riot-js/src/main/web/js/Poll.js | 10 + pollen-ui-riot-js/src/main/web/js/PollForm.js | 12 +- pollen-ui-riot-js/src/main/web/js/Session.js | 5 +- .../src/main/web/tag/poll/Poll.tag.html | 8 +- .../src/main/web/tag/poll/Settings.tag.html | 8 + 10 files changed, 1126 insertions(+), 1081 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.