Michael Telatynski 5844bee8f2 Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks ...

 Conflicts:

	src/components/views/avatars/BaseAvatar.js

2020-05-15 00:16:41 +01:00

..

structures

Merge pull request #4588 from matrix-org/t3chguy/kbd1

2020-05-14 19:29:09 +01:00

views

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

2020-05-15 00:16:41 +01:00