Michael Telatynski ae44a6d1fa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180 ... Conflicts: src/settings/Settings.ts src/settings/UIFeature.ts		2020-09-17 13:42:27 +01:00
..
structures	Fixed 1px jump upwards on filter room members box	2020-09-08 15:29:16 -04:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180	2020-09-17 13:42:27 +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 pull request #5182 from matrix-org/jryans/defer-cross-signing-setup	2020-09-11 09:41:40 +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