Merge branch 'develop' into travis/pinned-room-list

2018-10-25 10:57:08 -06:00
parent 3d8f0adf56 85bb8392c4
commit 9cdb527163
53 changed files with 999 additions and 416 deletions
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -84,6 +84,7 @@ const SIMPLE_SETTINGS = [
    { id: "RoomSubList.showEmpty" },
    { id: "pinMentionedRooms" },
    { id: "pinUnreadRooms" },
+    { id: "showDeveloperTools" },
 ];

 // These settings must be defined in SettingsStore