Merge branch 'develop' into experimental

2018-11-06 15:28:20 +01:00 · 2018-11-06 15:28:20 +01:00 · c19b593f5c
commit c19b593f5c
parent f8f4dde3ec 57ee816c90
7 changed files with 154 additions and 19 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" },
 ];