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

 Conflicts:

	src/components/structures/SpaceRoomView.tsx

2021-09-02 12:10:20 +01:00

..

structures

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

2021-09-02 12:10:20 +01:00

views

Merge pull request #6720 from matrix-org/gsouquet/replies-fix-18717

2021-09-02 08:42:54 +01:00