From af35696db92f0bf135260de4da28ace5e0a489d9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 1 Apr 2020 15:35:02 +0100 Subject: [PATCH] Reset matrix-js-sdk back to develop branch --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index c323431f3b..34ee3a829a 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "favico.js": "^0.3.10", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "5.2.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "2.3.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index de40bc5b76..4d79603f0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7452,7 +7452,7 @@ mathml-tag-names@^2.1.1: "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "5.2.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/223d37ffce674a23ca73702f04b9ba31cfd84196" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/934ed37fdc90948273d7da3ec9f8728195c78a63" dependencies: "@babel/runtime" "^7.8.3" another-json "^0.2.0" @@ -7502,7 +7502,7 @@ matrix-react-sdk@2.3.1: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "5.2.0" minimist "^1.2.0" pako "^1.0.5" png-chunks-extract "^1.0.0"