From 6875ffe0d5bc73b801c0c101b17d1245657d8dd5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 5 Jun 2020 16:03:24 +0100 Subject: [PATCH] Reset matrix-react-sdk back to develop branch --- package.json | 2 +- yarn.lock | 22 +++------------------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 2a7bafbe5d..c02296b321 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "2.7.1", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 233bdd2716..d706a73eca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6961,21 +6961,6 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -matrix-js-sdk@6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.1.tgz#d5f76491a650c0a36fcdd078cff59f2da96edd7b" - integrity sha512-X12Y2SMg8MOJwE5P3VMsMV/mnQHOmyJkF+FZRida124w4B4tBJouaNxteYyYaH34w+wyaKGxuqEBXecfSpfvbw== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "6.2.1" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ebe66bdd6e0f6edbc60be1612c5a1fc0c9ea092c" @@ -6998,10 +6983,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@2.7.1: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "2.7.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.7.1.tgz#bfde7e0d074769b209fa769d8dac6ad255c8b409" - integrity sha512-xf15VfHv/zoW1FnTdc7Dn0PITc8UuCqGlwCI2sMihp6kXrvsiUxaNkWTXzLbcwwX5Oahc3NQ7dkLaGB2AoXjIA== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/d54308a8c6385a6374187d041b1259755a7dac2a" dependencies: "@babel/runtime" "^7.8.3" await-lock "^2.0.1" @@ -7029,7 +7013,7 @@ matrix-react-sdk@2.7.1: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "6.2.1" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" minimist "^1.2.0" pako "^1.0.5" parse5 "^5.1.1"