Jonathan Rainville 756d77a9b1 conflict en.json		2018-05-31 08:38:20 -04:00
..
locales	conflict en.json	2018-05-31 08:38:20 -04:00
i18n.js	Adding fr translation	2018-05-20 20:53:08 +01:00