matrix-react-sdk

b7974c4f - Merge pull request #2290 from matrix-org/travis/account-merging-improvements