Michael Telatynski a1d25efceb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets ... Conflicts: src/components/structures/RoomView.tsx		2020-10-13 13:45:22 +01:00
..
strings	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets	2020-10-13 13:45:22 +01:00