Michael Telatynski 539465ecb4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 ...

 Conflicts:

	src/components/views/dialogs/InviteDialog.tsx

2021-06-14 22:22:30 +01:00

..

strings

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

2021-06-14 22:22:30 +01:00