Michael Telatynski 66fce64ee0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 ... Conflicts: package.json yarn.lock		2021-06-14 21:39:06 +01:00
..
structures	Merge branch 'develop' into gsouquet/react-17	2021-06-09 12:01:35 +01:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282	2021-06-14 21:39:06 +01:00
stub-component.js	fix test stub	2020-08-29 13:02:45 +01:00