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

Browse source 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
This commit is contained in:
Michael Telatynski 2021-07-15 10:19:04 +01:00
commit 50b6c5c557
45 changed files with 902 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/rooms/Stickerpicker.js
View file

@ -224,7 +224,7 @@ export default class Stickerpicker extends React.PureComponent {
}
_getStickerpickerContent() {
// Handle Integration Manager errors
// Handle integration manager errors
if (this.state._imError) {
return this._errorStickerpickerContent();
}