Michael Telatynski 5dbd79c729 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/querystring ...

 Conflicts:

	package.json

	src/@types/global.d.ts

	src/components/views/elements/AppTile.js

	src/utils/HostingLink.js

	yarn.lock

2021-07-16 12:47:33 +01:00

..

structures

Merge pull request #6374 from matrix-org/copy-room

2021-07-16 11:14:00 +01:00

views

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

2021-07-16 12:47:33 +01:00