Olivier Massot 949bc3fdb9 fix merge conflicts hai 7 meses
..
fr 949bc3fdb9 fix merge conflicts hai 7 meses
en.json e1623cbe46 fix post upgrade bugs hai 1 ano
fr.json.removed e1623cbe46 fix post upgrade bugs hai 1 ano