Michael Telatynski a688e5b8b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 ... Conflicts: src/components/structures/LoggedInView.tsx src/stores/SpaceStore.tsx		2021-09-06 11:41:09 +01:00
..
MemberList-test.tsx	Fourth batch of burning	2021-07-02 18:15:05 +02:00
RoomList-test.js	delint test	2021-08-11 16:12:08 +01:00
RoomSettings-test.js	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
SendMessageComposer-test.js	Make composer able to reply in thread or in room timeline	2021-09-01 12:12:40 +01:00