Olivier Massot 0ba5b1195f Merge branch 'master' into release/2.6.1 hai 3 meses
..
fr 0ba5b1195f Merge branch 'master' into release/2.6.1 hai 3 meses
en.json e1623cbe46 fix post upgrade bugs hai 1 ano
fr.json.removed e1623cbe46 fix post upgrade bugs hai 1 ano