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
..
collapse.ts	update copyrights	2020-10-20 23:42:12 +01:00
fixed.ts	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets	2020-10-21 09:56:22 +01:00
percentage.ts	Iterate the resizer	2020-10-13 12:28:23 +01:00