Michael Telatynski bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets ... Conflicts: src/components/views/elements/AppTile.js src/utils/WidgetUtils.ts		2020-10-19 20:50:16 +01:00
..
css	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets	2020-10-19 20:50:16 +01:00
fonts	…
img	…
media	…
themes	Merge pull request #5319 from matrix-org/t3chguy/fix/null-avatar	2020-10-15 17:48:51 +01:00