Michael Telatynski 7d28137cfd Merge branches 'develop' and 't3chguy/shortcuts1' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts1		2020-03-19 19:18:20 +00:00
..
css	Merge branches 'develop' and 't3chguy/shortcuts1' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts1	2020-03-19 19:18:20 +00:00
fonts	upgrade nunito from 3.500 to 3.504	2019-11-20 16:36:27 +00:00
img	add missing asset	2020-03-13 00:18:33 +00:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd	2020-03-18 20:41:13 +00:00