Michael Telatynski 57bf64bd28 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 ...

 Conflicts:

	src/components/views/spaces/SpacePanel.tsx

2021-08-12 12:05:55 +01:00

..

css

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088

2021-08-12 12:05:55 +01:00

fonts

Update Twemoji fonts for Unicode Emoji 13.1

2021-07-19 10:45:26 +01:00

img

Delabs Spaces, keeping it as a default-on preference for the time being

2021-08-11 14:52:40 +01: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