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
..
2020-10-14 16:30:38 -06:00
2020-10-14 16:30:38 -06:00
2020-07-14 20:36:27 +02:00
2020-10-14 16:30:38 -06:00
2020-10-13 12:27:50 +01:00
2020-09-17 10:44:58 -06:00
2020-10-07 20:23:34 +01:00