Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups

2018-11-20 18:08:39 +00:00
parent 6d6e6b5a4e 93cd3b4206
commit 8ccaf53d20
47 changed files with 2578 additions and 205 deletions
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -82,6 +82,8 @@ const SIMPLE_SETTINGS = [
    { id: "TagPanel.disableTagPanel" },
    { id: "enableWidgetScreenshots" },
    { id: "RoomSubList.showEmpty" },
+    { id: "pinMentionedRooms" },
+    { id: "pinUnreadRooms" },
    { id: "showDeveloperTools" },
 ];