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
..
dialogs	fix duplicate import	2021-07-02 14:54:10 +01:00
elements	Update eslint plugin & fix silly indenting	2021-08-03 17:07:37 +01:00
groups	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
messages	Fix tests	2021-07-16 15:30:26 -04:00
rooms	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088	2021-09-06 11:41:09 +01:00