imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
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