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

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092

Browse source
This commit is contained in:
Michael Telatynski 2021-08-06 11:39:24 +01:00
commit 64995dfae7
33 changed files with 290 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
View file

@ -157,6 +157,7 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
'MessageComposerInput.suggestEmoji',
'sendTypingNotifications',
'MessageComposerInput.ctrlEnterToSend',
'MessageComposerInput.surroundWith',
'MessageComposerInput.showStickersButton',
];