gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reset matrix-react-sdk back to develop branch

This commit is contained in:
RiotRobot 2020-07-15 12:14:38 +01:00
parent 6886dbcbd4
commit 7c17272c83
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -61,7 +61,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": "2.10.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",
"postcss-easings": "^2.0.0", "postcss-easings": "^2.0.0",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",

9
yarn.lock
View File

@ -6978,7 +6978,7 @@ 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@7.1.0, "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "7.1.0" version "7.1.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2a688bdac828dc62916437d83c72cef1e525d5f9" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2a688bdac828dc62916437d83c72cef1e525d5f9"
dependencies: dependencies:
@ -7000,10 +7000,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@2.10.0: "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "2.10.0" version "2.10.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.10.0.tgz#41548173d46da0e746319256acdda117766cec6e" resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/7098cbfce1bd1e6e14a49e9b2e11c8041ae8a86a"
integrity sha512-70wmkuXCkKQUJNDvoJ9EzdSeBtefOFDMr18r2SM5ujKGAIMiIxg/ZFm68oZ57b/eypj6pedTJN2dAcSznT/Tgw==
dependencies: dependencies:
"@babel/runtime" "^7.8.3" "@babel/runtime" "^7.8.3"
await-lock "^2.0.1" await-lock "^2.0.1"
@ -7031,7 +7030,7 @@ matrix-react-sdk@2.10.0:
is-ip "^2.0.0" is-ip "^2.0.0"
linkifyjs "^2.1.6" linkifyjs "^2.1.6"
lodash "^4.17.14" lodash "^4.17.14"
matrix-js-sdk "7.1.0" matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
minimist "^1.2.0" minimist "^1.2.0"
pako "^1.0.5" pako "^1.0.5"
parse5 "^5.1.1" parse5 "^5.1.1"