Olivier Massot 1d2f609cbb resolve conflicts after stash pop il y a 2 ans
..
en.json 3cc22f5023 install and configure i18n il y a 3 ans
fr.json 1d2f609cbb resolve conflicts after stash pop il y a 2 ans