Michael Telatynski 517b594edc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.1 ... Conflicts: src/components/structures/RightPanel.js		2020-09-08 18:04:24 +01:00
..
structures	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.1	2020-09-08 18:04:24 +01:00
views	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.1	2020-09-08 18:04:24 +01:00