Merge branch 'develop' into experimental

2018-10-26 15:33:39 +02:00 · 2018-10-26 15:33:39 +02:00 · 2c039483c6
commit 2c039483c6
parent adee0fdcef e799b30b89
42 changed files with 469 additions and 233 deletions
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@ -290,4 +290,9 @@ export const SETTINGS = {
        displayName: _td('Show empty room list headings'),
        default: true,
    },
+    "showDeveloperTools": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Show developer tools'),
+        default: false,
+    },
 };