Michael Telatynski ae65ed5c2e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into resizable-appsdrawer ... Conflicts: res/css/views/rooms/_AppsDrawer.scss		2020-08-20 10:26:35 +01:00
..
structures	Iterate PR, tweak margins	2020-08-18 12:00:56 +01:00
views	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into resizable-appsdrawer	2020-08-20 10:26:35 +01:00
_common.scss	Merge pull request #5056 from matrix-org/joriks/style-fighting	2020-08-12 15:21:06 +01:00
_components.scss	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs	2020-08-18 17:36:04 +01:00
_font-sizes.scss	Use rem to guard against font scaling breakages	2020-07-16 20:15:28 +05:30
_font-weights.scss	Iterate PR, tweak margins	2020-08-18 12:00:56 +01:00
rethemendex.sh	Remove sort and include new scss file in components	2020-04-02 13:42:59 +01:00