matrix-react-sdk

2fe2e76f - Merge pull request #2398 from matrix-org/travis/back-out-bad-merge