matrix-react-sdk

f63e6fde - Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/single_unsent

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/single_unsent Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/structures/RoomStatusBar.js # src/components/structures/RoomView.js # src/i18n/strings/en_EN.json