Michael Telatynski 38dbe89316 Merge branch 't3chguy/fix/18092' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 ... Conflicts: src/components/views/spaces/SpaceCreateMenu.tsx src/i18n/strings/en_EN.json		2021-08-11 20:53:41 +01:00
..
structures	Delabs Spaces, keeping it as a default-on preference for the time being	2021-08-11 14:52:40 +01:00
views	Merge branch 't3chguy/fix/18092' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088	2021-08-11 20:53:41 +01:00
_common.scss	Inherit font-family	2021-06-26 20:53:14 +02:00
_components.scss	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088	2021-08-11 20:51:47 +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