Olivier Massot 0ba5b1195f Merge branch 'master' into release/2.6.1 vor 3 Monaten
..
abilities 0ba5b1195f Merge branch 'master' into release/2.6.1 vor 3 Monaten
theme.ts 0548a7673f fix merge conflicts vor 4 Monaten