Michael Telatynski de42a00ca4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ... Conflicts: src/components/views/avatars/RoomAvatar.tsx test/stores/SpaceStore-test.ts test/test-utils.js		2021-07-19 16:47:31 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-19 16:47:31 +01:00
fonts	Update Inter font to v3.18	2021-04-09 17:41:54 +01:00
img	Merge branch 'develop' into travis/notifications-2	2021-07-16 16:20:23 -06:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Add dialpad to transfer dialog + various dialpad UI improvements (#6363)	2021-07-15 09:55:58 +01:00