Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces1

Conflicts: src/utils/objects.ts
2021-02-25 10:50:56 +00:00
parent a823572394 a44c0ecbd6
commit 0f0edbfb14
45 changed files with 2606 additions and 675 deletions
@@ -61,7 +61,7 @@ for (const key of Object.keys(LEVEL_HANDLERS)) {
    LEVEL_HANDLERS[key] = new LocalEchoWrapper(LEVEL_HANDLERS[key]);
 }

-const LEVEL_ORDER = [
+export const LEVEL_ORDER = [
    SettingLevel.DEVICE,
    SettingLevel.ROOM_DEVICE,
    SettingLevel.ROOM_ACCOUNT,