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 c1e83d29949e86a7821bf76b09bec3e6e2f4426d Merge: 628f5736 9dbd4c8f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Oct 23 17:07:36 2017 +0200 Merge branch 'feature/41_mentions_legales' into 'develop' #41 - Intègre les mentions légales à Pollen Closes #41 See merge request chorem/pollen!7 .../web/{home/en.html => customData/home-en.html} | 4 ++-- .../web/{home/fr.html => customData/home-fr.html} | 4 ++-- .../src/main/web/customData/legalNotices-en.html | 14 +++++++++++++ .../src/main/web/customData/legalNotices-fr.html | 13 ++++++++++++ .../src/main/web/{home => customData}/lutin.png | Bin .../src/main/web/{home => customData}/style.css | 0 pollen-ui-riot-js/src/main/web/i18n/en.json | 2 ++ pollen-ui-riot-js/src/main/web/i18n/fr.json | 2 ++ .../tag/{Home.tag.html => ContentLoader.tag.html} | 17 +++++++++------ pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 23 ++++++++++++++------- .../src/main/web/tag/PollenFooter.tag.html | 1 + .../src/main/web/tag/Privacy.tag.html | 4 ++-- pollen-ui-riot-js/webpack.config.js | 2 +- 13 files changed, 66 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.