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 pull request #2441 from matrix-org/develop

Browse Source 
Merge develop -> experimental
This commit is contained in:
Travis Ralston
2019-01-14 14:45:20 -07:00
committed by GitHub
parent 2a20d9d67e a3240358f1
commit 177d9f245a
5 changed files with 217 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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