Michael Telatynski 111ae75874 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969 ... Conflicts: src/components/views/right_panel/UserInfo.tsx		2021-10-08 13:00:20 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969	2021-10-08 13:00:20 +01:00
fonts	Update Twemoji fonts for Unicode Emoji 13.1	2021-07-19 10:45:26 +01:00
img	Merge branch 'develop' into export-conversations	2021-09-29 19:32:05 +05:30
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Merge pull request #6868 from SimonBrandner/task/colors-3-mk2	2021-10-01 11:04:15 +02:00