matrix-react-sdk

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

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606
Conflicts:
src/components/structures/RoomView.tsx
src/components/views/right_panel/UserInfo.tsx