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-06-29 16:23:35 +01:00
parent d4fa099877
commit af349a7ac5
2 changed files with 4 additions and 5 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",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "2.8.1",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"postcss-easings": "^2.0.0",
"prop-types": "^15.7.2",

7
yarn.lock
View File

@ -6995,10 +6995,9 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
matrix-react-sdk@2.8.1:
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "2.8.1"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.8.1.tgz#df358fe4f7a1ae6a913c9c587a16dd1c5c8c5272"
integrity sha512-jytPkiASlJMuH6zZ/FTQAEJKe2FOmpbg6fsZQb97yRMTascPJsgDVaVPb/+6q7dlPYKXGXaTQ05lY4tFrdnqbQ==
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/0059d44e1512e87a108b91d93e820b0dcc7be2a9"
dependencies:
"@babel/runtime" "^7.8.3"
await-lock "^2.0.1"
@ -7026,7 +7025,7 @@ matrix-react-sdk@2.8.1:
is-ip "^2.0.0"
linkifyjs "^2.1.6"
lodash "^4.17.14"
matrix-js-sdk "7.0.0"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
minimist "^1.2.0"
pako "^1.0.5"
parse5 "^5.1.1"