Merge branch 'experimental' into travis/settings/positive

2019-01-28 08:25:40 -07:00
parent e1bc1eee43 55e0838c82
commit a1e3887a74
50 changed files with 2044 additions and 873 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -125,6 +125,12 @@ export const SETTINGS = {
        supportedLevels: LEVELS_FEATURE,
        default: false,
    },
+    "feature_sas": {
+        isFeature: true,
+        displayName: _td("Two-way device verification using short text"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
    "MessageComposerInput.suggestEmoji": {
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
        displayName: _td('Enable Emoji suggestions while typing'),