Olivier Massot e35a052b1c fix merge conflicts hai 7 meses
..
en.json e1623cbe46 fix post upgrade bugs hai 11 meses
fr.json e35a052b1c fix merge conflicts hai 7 meses
fr.json.removed e1623cbe46 fix post upgrade bugs hai 11 meses