Merge branch 'develop' into experimental

2018-11-26 13:10:29 +01:00 · 2018-11-26 13:10:29 +01:00 · 67e0030ccd
commit 67e0030ccd
parent 04bb9aad3a 0c6e98548e
60 changed files with 3738 additions and 222 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@ -90,6 +90,12 @@ export const SETTINGS = {
        controller: new LazyLoadingController(),
        default: true,
    },
+    "feature_keybackup": {
+        isFeature: true,
+        displayName: _td("Backup of encryption keys to server"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
    "MessageComposerInput.dontSuggestEmoji": {
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
        displayName: _td('Disable Emoji suggestions while typing'),