OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Reset matrix-react-sdk back to develop branch

pull/15601/head
RiotRobot 2020-10-28 15:24:23 +00:00
parent a3fdb1c2a2
commit 35327ff6a4
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -61,7 +61,7 @@
"highlight.js": "^9.13.1", "highlight.js": "^9.13.1",
"jsrsasign": "^9.1.5", "jsrsasign": "^9.1.5",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "3.7.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"matrix-widget-api": "^0.1.0-beta.5", "matrix-widget-api": "^0.1.0-beta.5",
"olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",

22
yarn.lock
View File

@ -7898,21 +7898,6 @@ mathml-tag-names@^2.1.1:
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
matrix-js-sdk@9.0.1:
version "9.0.1"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.1.tgz#bb84a80db0dec1c21b6867c38bb2aa3f63811d6d"
integrity sha512-D2b/pf1/0FTnJoroZhhFCo9WFv+iXELqDgEozo0mBSTbQolIXjHLDQfmhi3p7nDZxxtjWvJjVaiKiVQPjwHCrg==
dependencies:
"@babel/runtime" "^7.11.2"
another-json "^0.2.0"
browser-request "^0.3.3"
bs58 "^4.0.1"
content-type "^1.0.4"
loglevel "^1.7.0"
qs "^6.9.4"
request "^2.88.2"
unhomoglyph "^1.0.6"
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "9.0.1" version "9.0.1"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f8863d5c2488a31a093f5a1b11761d7ac3829470" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/f8863d5c2488a31a093f5a1b11761d7ac3829470"
@ -7935,10 +7920,9 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0" bluebird "^3.5.0"
expect "^1.20.2" expect "^1.20.2"
matrix-react-sdk@3.7.1: "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.7.1" version "3.7.1"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.7.1.tgz#0a2d9c2c7d224297277532bcf78f60984f6bc49e" resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/a708dbf6e9ed26108ef86ee07ff36f9ca56c0ccd"
integrity sha512-JwCURRs0WBuqVQ5/0fYg19SEb2Dg8y1F93GiiCssAoMW/bbTiMA6B/moLeZDO2mQPlhqwRtAH1aeLvdKrA/q6w==
dependencies: dependencies:
"@babel/runtime" "^7.10.5" "@babel/runtime" "^7.10.5"
await-lock "^2.0.1" await-lock "^2.0.1"
@ -7965,7 +7949,7 @@ matrix-react-sdk@3.7.1:
is-ip "^2.0.0" is-ip "^2.0.0"
linkifyjs "^2.1.9" linkifyjs "^2.1.9"
lodash "^4.17.19" lodash "^4.17.19"
matrix-js-sdk "9.0.1" matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
matrix-widget-api "^0.1.0-beta.5" matrix-widget-api "^0.1.0-beta.5"
minimist "^1.2.5" minimist "^1.2.5"
pako "^1.0.11" pako "^1.0.11"