Skip to content

Commit 7c17272

Browse files
committed
Reset matrix-react-sdk back to develop branch
1 parent 6886dbc commit 7c17272

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"gfm.css": "^1.1.2",
6262
"highlight.js": "^9.13.1",
6363
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
64-
"matrix-react-sdk": "2.10.0",
64+
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
6565
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
6666
"postcss-easings": "^2.0.0",
6767
"prop-types": "^15.7.2",

yarn.lock

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6978,7 +6978,7 @@ mathml-tag-names@^2.1.1:
69786978
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
69796979
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
69806980

6981-
matrix-js-sdk@7.1.0, "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
6981+
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
69826982
version "7.1.0"
69836983
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2a688bdac828dc62916437d83c72cef1e525d5f9"
69846984
dependencies:
@@ -7000,10 +7000,9 @@ matrix-mock-request@^1.2.3:
70007000
bluebird "^3.5.0"
70017001
expect "^1.20.2"
70027002

7003-
matrix-react-sdk@2.10.0:
7003+
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
70047004
version "2.10.0"
7005-
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.10.0.tgz#41548173d46da0e746319256acdda117766cec6e"
7006-
integrity sha512-70wmkuXCkKQUJNDvoJ9EzdSeBtefOFDMr18r2SM5ujKGAIMiIxg/ZFm68oZ57b/eypj6pedTJN2dAcSznT/Tgw==
7005+
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/7098cbfce1bd1e6e14a49e9b2e11c8041ae8a86a"
70077006
dependencies:
70087007
"@babel/runtime" "^7.8.3"
70097008
await-lock "^2.0.1"
@@ -7031,7 +7030,7 @@ matrix-react-sdk@2.10.0:
70317030
is-ip "^2.0.0"
70327031
linkifyjs "^2.1.6"
70337032
lodash "^4.17.14"
7034-
matrix-js-sdk "7.1.0"
7033+
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
70357034
minimist "^1.2.0"
70367035
pako "^1.0.5"
70377036
parse5 "^5.1.1"

0 commit comments

Comments
 (0)