Michael Telatynski 6d0af83df4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969 ... Conflicts: src/components/views/dialogs/LeaveSpaceDialog.tsx src/i18n/strings/en_EN.json		2021-09-27 11:19:49 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969	2021-09-27 11:19:49 +01:00
fonts	Update Twemoji fonts for Unicode Emoji 13.1	2021-07-19 10:45:26 +01:00
img	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088	2021-09-06 11:41:09 +01:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Replace dark theme's $authpage-primary-color	2021-09-10 01:21:53 -04:00