Michael Telatynski 55a18b8c2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15255 ... Conflicts: src/components/views/settings/ProfileSettings.js		2020-10-06 10:51:30 +01:00
..
structures	Merge pull request #5268 from matrix-org/t3chguy/fix/15349	2020-10-06 00:32:05 +01:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15255	2020-10-06 10:51:30 +01:00