Jonathan Rainville 2b54dfd7cc conflict in en.json		2018-05-30 10:57:25 -04:00
..
locales	conflict in en.json	2018-05-30 10:57:25 -04:00
i18n.js	Adding fr translation	2018-05-20 20:53:08 +01:00