matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Travis Ralston
2018-10-25 10:57:08 -06:00
committed by GitHub
parent 3d8f0adf56 85bb8392c4
commit 9cdb527163
53 changed files with 999 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/structures/UserSettings.js
View File

@ -84,6 +84,7 @@ const SIMPLE_SETTINGS = [
{ id: "RoomSubList.showEmpty" },
{ id: "pinMentionedRooms" },
{ id: "pinUnreadRooms" },
{ id: "showDeveloperTools" },
];
// These settings must be defined in SettingsStore