Jaiwanth 6a4e2672f6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations		2021-07-10 19:18:01 +05:30
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations	2021-07-10 19:18:01 +05:30
fonts	Update Inter font to v3.18	2021-04-09 17:41:54 +01:00
img	Merge and resolve conflicts	2021-06-30 12:29:13 +05:30
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