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

Reset matrix-js-sdk back to develop branch

This commit is contained in:
RiotRobot 2020-04-01 15:35:02 +01:00
parent ccd998d709
commit af35696db9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -68,7 +68,7 @@
"favico.js": "^0.3.10", "favico.js": "^0.3.10",
"gfm.css": "^1.1.2", "gfm.css": "^1.1.2",
"highlight.js": "^9.13.1", "highlight.js": "^9.13.1",
"matrix-js-sdk": "5.2.0", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "2.3.1", "matrix-react-sdk": "2.3.1",
"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",

4
yarn.lock
View File

@ -7452,7 +7452,7 @@ mathml-tag-names@^2.1.1:
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "5.2.0" version "5.2.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/223d37ffce674a23ca73702f04b9ba31cfd84196" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/934ed37fdc90948273d7da3ec9f8728195c78a63"
dependencies: dependencies:
"@babel/runtime" "^7.8.3" "@babel/runtime" "^7.8.3"
another-json "^0.2.0" another-json "^0.2.0"
@ -7502,7 +7502,7 @@ matrix-react-sdk@2.3.1:
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 "github:matrix-org/matrix-js-sdk#develop" matrix-js-sdk "5.2.0"
minimist "^1.2.0" minimist "^1.2.0"
pako "^1.0.5" pako "^1.0.5"
png-chunks-extract "^1.0.0" png-chunks-extract "^1.0.0"