Michael Telatynski a5468c918e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets ...

 Conflicts:

	src/resizer/distributors/collapse.ts

	src/resizer/distributors/fixed.ts

	src/resizer/index.ts

	src/resizer/item.ts

	src/resizer/resizer.ts

	src/resizer/sizer.ts

2020-10-21 09:56:22 +01:00

..

structures

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets

2020-10-21 09:56:22 +01:00

views

iterate PR based on feedback

2020-10-21 09:48:02 +01:00

_common.scss

Discard all mx_fadable legacy cruft which is totally useless

2020-10-15 16:13:16 +01:00

_components.scss

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets

2020-10-19 13:08:17 +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