Michael Telatynski 667c129ebc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785
 Conflicts:
	src/components/structures/ScrollPanel.js
	src/components/views/rooms/AppsDrawer.js
2020-09-07 14:33:57 +01:00
..
2020-08-14 10:30:54 +01:00
2020-08-25 21:08:24 -06:00
2020-08-27 10:46:29 +01:00
2020-03-31 15:26:23 +01:00