Michael Telatynski 532b2e5ced Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/home-page-analytics ... Conflicts: src/components/structures/HomePage.tsx		2020-11-19 11:11:10 +00:00
..
structures	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/home-page-analytics	2020-11-19 11:11:10 +00:00
views	Merge pull request #5331 from Transfusion/invisible_rooms_notif_badge	2020-11-18 15:24:01 -07:00