Olivier Massot 949bc3fdb9 fix merge conflicts il y a 4 mois
..
fr 949bc3fdb9 fix merge conflicts il y a 4 mois
en.json e1623cbe46 fix post upgrade bugs il y a 1 an
fr.json.removed e1623cbe46 fix post upgrade bugs il y a 1 an