Michael Telatynski 1f337b28ac Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash ... Conflicts: src/ContentMessages.tsx src/components/structures/UploadBar.tsx src/components/views/messages/MImageBody.js src/components/views/messages/MStickerBody.js src/components/views/messages/MVideoBody.tsx		2021-07-01 20:48:34 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash	2021-07-01 20:48:34 +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	Tile styling and early behaviour	2021-06-24 13:56:11 -06:00