Michael Telatynski ddb0f06005 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration ... Conflicts: src/components/views/right_panel/VerificationPanel.js		2020-01-27 15:46:38 +00:00
..
css	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration	2020-01-27 15:46:38 +00:00
fonts	upgrade nunito from 3.500 to 3.504	2019-11-20 16:36:27 +00:00
img	Be consistent about our settings svg, free the other one	2020-01-22 15:34:17 +00:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	User verified but device deleted isn't a useful state	2020-01-20 17:15:38 +00:00