Michael Telatynski 56cd0e1c4f Merge branch 't3chguy/fix/18091' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 ...

 Conflicts:

	src/components/structures/SpaceRoomDirectory.tsx

2021-07-29 12:52:01 +01:00

..

css

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

2021-07-29 12:52:01 +01:00

fonts

Update Twemoji fonts for Unicode Emoji 13.1

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

img

Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share

2021-07-27 16:25:38 +02: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