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

Commit
6 years ago
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3  Conflicts:  src/components/structures/LoggedInView.js
Author
Loading