Olivier Massot 0ba5b1195f Merge branch 'master' into release/2.6.1 3 bulan lalu
..
fr 0ba5b1195f Merge branch 'master' into release/2.6.1 3 bulan lalu
en.json e1623cbe46 fix post upgrade bugs 11 bulan lalu
fr.json.removed e1623cbe46 fix post upgrade bugs 11 bulan lalu