Merge branch 'develop' into katex

2020-10-10 19:31:46 +01:00
parent a89adb86a5 0c6ac113f4
commit aafaf34233
157 changed files with 6534 additions and 4828 deletions
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -192,6 +192,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"),