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
..
structures	Change read markers to use CSS transitions	2019-11-26 19:06:02 +00:00
views	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
_common.scss	fix font smoothing to match figma	2019-11-27 00:45:49 +00:00
_components.scss	Merge pull request #3661 from matrix-org/bwindels/verif-toasts	2019-11-22 16:39:18 +00:00
rethemendex.sh	retheming commentary	2018-04-17 16:55:32 +01:00