Michael Telatynski 111ae75874 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969 ...

 Conflicts:

	src/components/views/right_panel/UserInfo.tsx

2021-10-08 13:00:20 +01:00

..

structures

Merge pull request #6906 from matrix-org/t3chguy/fix/19246

2021-10-08 10:36:48 +01:00

views

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

2021-10-08 13:00:20 +01:00