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

 Conflicts:

	src/SlashCommands.tsx

	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx

	src/createRoom.ts

2021-07-09 08:13:39 +01:00

..

css

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

2021-07-09 08:13:39 +01:00

fonts

Update Inter font to v3.18

2021-04-09 17:41:54 +01:00

img

Merge pull request #5671 from weeman1337/msg-context-menu

2021-06-29 08:18:07 +01:00

media

move default ringtones over from riot-web

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

themes

Add comments

2021-07-07 10:28:29 +02:00