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
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets	2020-10-21 09:56:22 +01:00
fonts	use Inter as font	2020-06-30 13:28:19 +02:00
img	fix default widget icons	2020-10-19 18:49:56 +01:00
media	move default ringtones over from riot-web	2018-04-12 00:25:36 +01:00
themes	Update Widget paddings and background colours	2020-10-19 18:47:15 +01:00