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/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@ -82,6 +82,7 @@ const SIMPLE_SETTINGS = [
    { id: "TagPanel.disableTagPanel" },
    { id: "enableWidgetScreenshots" },
    { id: "RoomSubList.showEmpty" },
+    { id: "showDeveloperTools" },
 ];

 // These settings must be defined in SettingsStore