matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Merge branch 'develop' into luke/submit-debug-logs

Browse Source
This commit is contained in:
Luke Barnard
2018-03-19 14:55:28 +00:00
parent aed7c2039d e9161df3ad
commit 0c125b3dff
80 changed files with 4708 additions and 835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,6 +79,7 @@ const SIMPLE_SETTINGS = [
{ id: "Pill.shouldHidePillAvatar" },
{ id: "TextualBody.disableBigEmoji" },
{ id: "VideoView.flipVideoHorizontally" },
{ id: "TagPanel.disableTagPanel" },
];
// These settings must be defined in SettingsStore