Merge branch 'develop' into travis/pinned-room-list
This commit is contained in:
commit
9cdb527163
53 changed files with 999 additions and 416 deletions
|
@ -84,6 +84,7 @@ const SIMPLE_SETTINGS = [
|
|||
{ id: "RoomSubList.showEmpty" },
|
||||
{ id: "pinMentionedRooms" },
|
||||
{ id: "pinUnreadRooms" },
|
||||
{ id: "showDeveloperTools" },
|
||||
];
|
||||
|
||||
// These settings must be defined in SettingsStore
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue