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

..

distributors

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

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

index.ts

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

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

item.ts

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

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

resizer.ts

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

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

sizer.ts

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

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