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

Merge branch 'develop' into improve-codeblock

Browse source
This commit is contained in:
Šimon Brandner 2021-02-08 15:26:50 +01:00
commit 84eba59afa
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
156 changed files with 7049 additions and 5122 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
View file

@ -34,6 +34,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
'MessageComposerInput.suggestEmoji',
'sendTypingNotifications',
'MessageComposerInput.ctrlEnterToSend',
'MessageComposerInput.showStickersButton',
];
static TIMELINE_SETTINGS = [
@ -54,6 +55,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
'showImages',
'showChatEffects',
'Pill.shouldShowPillAvatar',
'ctrlFForSearch',
];
static GENERAL_SETTINGS = [