Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real

2019-01-03 16:00:23 -07:00
parent 6447a60e1f 2fe2e76fa5
commit 8017f0a4a1
164 changed files with 4652 additions and 2772 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -206,8 +206,8 @@ export const SETTINGS = {
        default: false,
    },
    "theme": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: "light",
+        supportedLevels: ['config'],
+        default: "dharma",
    },
    "webRtcForceTURN": {
        supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,