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	…
_common.scss	…
_components.scss	…
_font-sizes.scss	…
_font-weights.scss	…
rethemendex.sh	…