Olivier Massot 0ba5b1195f Merge branch 'master' into release/2.6.1 il y a 3 mois
..
abilities 0ba5b1195f Merge branch 'master' into release/2.6.1 il y a 3 mois
theme.ts 0548a7673f fix merge conflicts il y a 4 mois