Michael Telatynski 18bb4bce35 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ...

 Conflicts:

	src/stores/SpaceStore.tsx

2021-07-22 12:44:27 +01:00

..

css

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

2021-07-22 12:44:27 +01:00

fonts

Update Twemoji fonts for Unicode Emoji 13.1

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

img

Add iconography to Create Room Dialog dropdown

2021-07-21 11:20:41 +01:00

media

move default ringtones over from riot-web

2018-04-12 00:25:36 +01:00

themes

Merge pull request #6432 from matrix-org/travis/voice-messages/colours

2021-07-22 03:39:29 -06:00