Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to

2018-05-02 13:08:38 +01:00 · 2018-05-02 13:08:38 +01:00 · f2102e283c
commit f2102e283c
parent ec4ec4717d 33e67a8f42
71 changed files with 1699 additions and 1077 deletions
--- a/test/test-utils.js
+++ b/test/test-utils.js
@ -92,6 +92,7 @@ export function createTestClient() {
                content: {},
            });
        },
+        mxcUrlToHttp: (mxc) => 'http://this.is.a.url/',
        setAccountData: sinon.stub(),
        sendTyping: sinon.stub().returns(Promise.resolve({})),
        sendMessage: () => Promise.resolve({}),