Michael Telatynski 1ba19e78f8 Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode ... Conflicts: package.json		2020-05-14 10:50:42 +01:00
..
css	Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode	2020-05-14 10:50:42 +01:00
fonts	upgrade nunito from 3.500 to 3.504	2019-11-20 16:36:27 +00:00
img	Merge pull request #4576 from matrix-org/t3chguy/kosovo2.0	2020-05-13 09:58:10 +01:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Merge pull request #4477 from JorikSchellekens/joriks/toggle-bg-color	2020-04-29 11:10:47 +01:00