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

Reset matrix-react-sdk back to develop branch

pull/14791/head
RiotRobot 2020-07-27 21:39:12 +01:00
parent b799a6eb84
commit f4e6828949
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

@ -60,7 +60,7 @@
"gfm.css": "^1.1.2", "gfm.css": "^1.1.2",
"highlight.js": "^9.13.1", "highlight.js": "^9.13.1",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "3.0.0", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"react": "^16.9.0", "react": "^16.9.0",

22
yarn.lock
View File

@ -7347,21 +7347,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@8.0.0:
version "8.0.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.0.tgz#78efb071ed1f6430553a9d6937d7bcfbae24cce8"
integrity sha512-1p0Bv5My0+opkgqq9jGMa8myimGjiuGjzONR9o9i+VY/2hCaT67qIs3oNM3RI+c8sanijr3CHBaeo4tfyXzOuQ==
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": "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "8.0.0" version "8.0.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c669382e12c8cd1d7d538421dfad4f50812af44d" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c669382e12c8cd1d7d538421dfad4f50812af44d"
@ -7384,10 +7369,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.0.0: "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.0.0" version "3.0.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.0.0.tgz#d7172bee17836409356c9406e7a5a08d7cfd916b" resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f9540dd7cd67666ad58beac9b11c7bc4a5872673"
integrity sha512-dIh+I6xuCpwqm+JKGcJam2L30P5VNKPXoBkVltpMmjBtNM390ppu+KyhuPB2D0yXHwzVmAyn38dvHXgAYtK74Q==
dependencies: dependencies:
"@babel/runtime" "^7.10.5" "@babel/runtime" "^7.10.5"
await-lock "^2.0.1" await-lock "^2.0.1"
@ -7415,7 +7399,7 @@ matrix-react-sdk@3.0.0:
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 "8.0.0" matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
minimist "^1.2.5" minimist "^1.2.5"
pako "^1.0.11" pako "^1.0.11"
parse5 "^5.1.1" parse5 "^5.1.1"