Michael Telatynski 83c30b2280 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 ... Conflicts: src/components/views/spaces/SpaceCreateMenu.tsx		2021-06-15 12:24:26 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244	2021-06-15 12:24:26 +01:00
fonts	Update Inter font to v3.18	2021-04-09 17:41:54 +01:00
img	Switch Space Settings for a tabbed view with a bunch more settings exposed	2021-06-08 16:33:47 +01:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Move and update variable usage	2021-05-05 14:00:56 -06:00