Michael Telatynski de42a00ca4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ... Conflicts: src/components/views/avatars/RoomAvatar.tsx test/stores/SpaceStore-test.ts test/test-utils.js		2021-07-19 16:47:31 +01:00
..
RoomViewStore-test.js	…
SpaceStore-setup.ts	…
SpaceStore-test.ts	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-19 16:47:31 +01:00