Merge branch 'develop' into travis/breadcrumbs/telemetry

2019-04-05 09:35:38 -06:00 · 2019-04-05 09:35:38 -06:00 · e2edae3383
commit e2edae3383
parent edc24c6a91 41c403c9a6
8 changed files with 168 additions and 39 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@ -258,6 +258,10 @@ export const SETTINGS = {
        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
        default: "en",
    },
+    "breadcrumb_rooms": {
+        supportedLevels: ['account'],
+        default: [],
+    },
    "analyticsOptIn": {
        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
        displayName: _td('Send analytics data'),