Michael Telatynski 064b533a4b Merge branches 'develop' and 't3chguy/shortcuts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3 ...

 Conflicts:

	src/components/structures/RoomView.js

2020-03-20 16:06:07 +00:00

..

strings

Merge branches 'develop' and 't3chguy/shortcuts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3

2020-03-20 16:06:07 +00:00