Michael Telatynski 539465ecb4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 ... Conflicts: src/components/views/dialogs/InviteDialog.tsx		2021-06-14 22:22:30 +01:00
..
structures	Merge pull request #6155 from matrix-org/t3chguy/spacesteammatewarning	2021-06-07 22:21:07 +01:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365	2021-06-14 22:22:30 +01:00
_common.scss	Add CSS containement rules for shorter reflow operations	2021-06-01 11:26:32 +01:00
_components.scss	Merge branch 'develop' into improved-forwarding-ui	2021-06-05 11:04:17 -04: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