Olivier Massot 949bc3fdb9 fix merge conflicts hai 3 meses
..
fr 949bc3fdb9 fix merge conflicts hai 3 meses
en.json e1623cbe46 fix post upgrade bugs hai 11 meses
fr.json.removed e1623cbe46 fix post upgrade bugs hai 11 meses