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