Michael Telatynski 2e19c7fd24 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
2021-05-11 13:40:28 +01:00
..
2021-03-24 19:43:33 +00:00
2021-02-26 11:46:54 +01:00
2021-04-29 22:02:18 +01:00
2020-09-17 10:44:58 -06:00
2021-04-21 16:24:17 -06:00
2021-04-15 18:02:48 +02:00
2020-10-07 20:23:34 +01:00
2021-03-26 11:13:39 +00:00