Michael Telatynski 493cd01ed3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071 ... Conflicts: res/css/views/dialogs/_AddExistingToSpaceDialog.scss src/utils/space.tsx		2021-07-29 15:22:52 +01:00
..
structures	Fix broken layout of the space hierarchy view	2021-07-27 13:09:43 +01:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071	2021-07-29 15:22:52 +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/18071	2021-07-29 15:22:52 +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