Michael Telatynski 0a209afdc2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 ... Conflicts: res/css/structures/_SpaceHierarchy.scss src/components/structures/SpaceHierarchy.tsx src/i18n/strings/en_EN.json		2021-08-12 11:41:03 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089	2021-08-12 11:41:03 +01:00
fonts	Update Twemoji fonts for Unicode Emoji 13.1	2021-07-19 10:45:26 +01:00
img	Remove seams from pin icon	2021-08-04 18:42:47 -04:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Merge pull request #6540 from SimonBrandner/task/color-cleanup-1	2021-08-11 10:55:27 -06:00