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

 Conflicts:

	src/components/views/elements/AppTile.js

2020-10-21 12:48:51 +01:00

..

css

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

2020-10-21 12:48:51 +01:00

fonts

…

img

fix default widget icons

2020-10-19 18:49:56 +01:00

media

…

themes

Update Widget paddings and background colours

2020-10-19 18:47:15 +01:00