Olivier Massot 1d2f609cbb resolve conflicts after stash pop 2 éve
..
en.json 3cc22f5023 install and configure i18n 3 éve
fr.json 1d2f609cbb resolve conflicts after stash pop 2 éve