matrix-react-sdk

10b6b33c - Merge pull request #2313 from matrix-org/travis/even-more-fixing-merging