Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets

Conflicts: src/components/views/elements/AppTile.js src/utils/WidgetUtils.ts
2020-10-19 20:50:16 +01:00
parent f7959fe64f 59871263ab
commit bec1d718e0
200 changed files with 7568 additions and 5549 deletions
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -186,6 +186,12 @@ export const SETTINGS: {[setting: string]: ISetting} = {
        supportedLevels: LEVELS_FEATURE,
        default: false,
    },
+    "feature_dehydration": {
+        isFeature: true,
+        displayName: _td("Offline encrypted messaging using dehydrated devices"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
    "advancedRoomListLogging": {
        // TODO: Remove flag before launch: https://github.com/vector-im/element-web/issues/14231
        displayName: _td("Enable advanced debugging for the room list"),