Michael Telatynski 1ba19e78f8 Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode ... Conflicts: package.json		2020-05-14 10:50:42 +01:00
..
structures	Merge pull request #4579 from matrix-org/t3chguy/create_room_public	2020-05-13 10:50:38 +01:00
views	Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode	2020-05-14 10:50:42 +01:00