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
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088	2021-09-06 11:41:09 +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	Make stronger background blur for light theme	2021-08-26 12:41:29 +02:00