matrix-react-sdk

bd614f3e - Merge pull request #2301 from matrix-org/travis/more-merging