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

2021-09-10 09:53:04 +01:00 · 2021-09-10 09:53:04 +01:00 · 80fd960304
commit 80fd960304
parent 41118b418f 6d38256c6a
32 changed files with 566 additions and 265 deletions
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@ -720,6 +720,10 @@ export const SETTINGS: {[setting: string]: ISetting} = {
        default: true,
        controller: new ReducedMotionController(),
    },
+    "Performance.addSendMessageTimingMetadata": {
+        supportedLevels: [SettingLevel.CONFIG],
+        default: false,
+    },
    "Widgets.pinned": { // deprecated
        supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
        default: {},