Skip to content

Commit e5a4092

Browse files
committed
Reset matrix-react-sdk back to develop branch
1 parent 3ed750a commit e5a4092

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"gfm.css": "^1.1.2",
6161
"highlight.js": "^9.13.1",
6262
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
63-
"matrix-react-sdk": "3.3.0",
63+
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
6464
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
6565
"prop-types": "^15.7.2",
6666
"react": "^16.9.0",

yarn.lock

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7312,21 +7312,6 @@ mathml-tag-names@^2.1.1:
73127312
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
73137313
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
73147314

7315-
matrix-js-sdk@8.2.0:
7316-
version "8.2.0"
7317-
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.2.0.tgz#6fbdadcdc563e41671d407d772a4d52ec8adc480"
7318-
integrity sha512-yKF/H1Matgf4b7bfa/gOPNcgMEujogC1r89Au8ZYKfv3dmNdJupE9ktdGJ28QVeKIyF5Ew1stLI4MdGWT1gYPw==
7319-
dependencies:
7320-
"@babel/runtime" "^7.8.3"
7321-
another-json "^0.2.0"
7322-
browser-request "^0.3.3"
7323-
bs58 "^4.0.1"
7324-
content-type "^1.0.2"
7325-
loglevel "^1.6.4"
7326-
qs "^6.5.2"
7327-
request "^2.88.0"
7328-
unhomoglyph "^1.0.2"
7329-
73307315
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
73317316
version "8.2.0"
73327317
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c6992e2056901502af19e40ba0d1103c4c1f61ed"
@@ -7349,10 +7334,9 @@ matrix-mock-request@^1.2.3:
73497334
bluebird "^3.5.0"
73507335
expect "^1.20.2"
73517336

7352-
matrix-react-sdk@3.3.0:
7337+
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
73537338
version "3.3.0"
7354-
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.3.0.tgz#42749f59151a1fbd8be81d917b7f2dfc406a4ad5"
7355-
integrity sha512-042QFASwbYYX69TQTzzSnRyaD4NXiME/Unn+GmUfWJBnGieuNaYb7ZFxVdUuPpks2UfHJF6xswsr1LpKWi92IQ==
7339+
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/0d290c9bd2604343610e1fc3b17bbdb941ad2ad6"
73567340
dependencies:
73577341
"@babel/runtime" "^7.10.5"
73587342
await-lock "^2.0.1"
@@ -7380,7 +7364,7 @@ matrix-react-sdk@3.3.0:
73807364
is-ip "^2.0.0"
73817365
linkifyjs "^2.1.9"
73827366
lodash "^4.17.19"
7383-
matrix-js-sdk "8.2.0"
7367+
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
73847368
minimist "^1.2.5"
73857369
pako "^1.0.11"
73867370
parse5 "^5.1.1"

0 commit comments

Comments
 (0)