Olivier Massot 0ba5b1195f Merge branch 'master' into release/2.6.1 hace 5 meses
..
abilities 0ba5b1195f Merge branch 'master' into release/2.6.1 hace 5 meses
theme.ts 0548a7673f fix merge conflicts hace 5 meses