Matrix/element-web
Matrix/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-09-09 22:55:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reset matrix-react-sdk back to develop branch

Browse source
This commit is contained in:
RiotRobot 2020-08-05 16:20:15 +01:00
parent 5935e3b145
commit 04afd0232b
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",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "3.1.0",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"prop-types": "^15.7.2",
"react": "^16.9.0",

22
yarn.lock
View file

@ -7312,21 +7312,6 @@ mathml-tag-names@^2.1.1:
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
matrix-js-sdk@8.0.1:
version "8.0.1"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1.tgz#dafd41023671249c01e4278e7103c93200b34e5e"
integrity sha512-DT2YjWi8l2eHyNTKZOhBkN/EakIMDDEglSCg+RWY4QzFaXYlSwfwfzzCujjtq1hxVSKim8NC7KqxgNetOiBegA==
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":
version "8.0.1"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a6fe4cdf1cbf56baeb538f071c27326fe98630d0"
@ -7349,10 +7334,9 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
matrix-react-sdk@3.1.0:
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.1.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.1.0.tgz#d8349942e6aa705195b30415c96d7576b783f011"
integrity sha512-LNSm4gX+c9Z2z39QyaQTSZmIAEI5nmIZ7uVq2X3ktn0NwmGwTcvC983t68ooHmIzAqVmh4JrscgzmdvPqk/YPw==
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/45b79a0b7c9237c6b4dbafd37c1a234ed2b7cf35"
dependencies:
"@babel/runtime" "^7.10.5"
await-lock "^2.0.1"
@ -7380,7 +7364,7 @@ matrix-react-sdk@3.1.0:
is-ip "^2.0.0"
linkifyjs "^2.1.9"
lodash "^4.17.19"
matrix-js-sdk "8.0.1"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
minimist "^1.2.5"
pako "^1.0.11"
parse5 "^5.1.1"