Olivier Massot e35a052b1c fix merge conflicts 7 bulan lalu
..
en.json e1623cbe46 fix post upgrade bugs 10 bulan lalu
fr.json e35a052b1c fix merge conflicts 7 bulan lalu
fr.json.removed e1623cbe46 fix post upgrade bugs 10 bulan lalu