Michael Telatynski 6d69ec17d9 Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus ... Conflicts: src/components/views/context_menus/RoomTileContextMenu.js		2019-11-28 16:25:59 +00:00
..
css	Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus	2019-11-28 16:25:59 +00:00
fonts	upgrade nunito from 3.500 to 3.504	2019-11-20 16:36:27 +00:00
img	Merge pull request #3653 from matrix-org/bwindels/fixe2eicons	2019-11-21 19:01:17 +00:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	make colors slightly more opaque than in design	2019-11-22 16:04:51 +01:00