This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 7aaf2704 Merge branch 'develop' of gitlab.nuiton.org:chorem/pollen into develop new 365dba8d Fixes #170 : Ajouter le mail dans le feedback The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 365dba8dbef728c2f3f0e180a6f7db722e5911a9 Author: Jean Couteau <jean.couteau@gmail.com> Date: Mon Apr 9 15:27:53 2018 +0200 Fixes #170 : Ajouter le mail dans le feedback Summary of changes: .../chorem/pollen/services/bean/FeedbackBean.java | 10 +++++++++ .../pollen/services/service/mail/EmailService.java | 1 + .../services/service/mail/FeedbackEmail.java | 10 +++++++++ .../main/resources/email/FeedbackEmail.mustache | 1 + .../main/resources/email/FeedbackEmail_fr.mustache | 1 + pollen-ui-riot-js/src/main/web/i18n/en.json | 1 + pollen-ui-riot-js/src/main/web/i18n/fr.json | 1 + .../src/main/web/tag/popup/FeedbackModal.tag.html | 26 ++++++++++++++++++++-- 8 files changed, 49 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.