Merge pull request #1936 from turt2live/travis/pinned-room-list

Add options to pin unread/mentioned rooms to the top of the room list

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" },
 ];