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/14350/head
RiotRobot 2020-07-03 13:37:33 +01:00
parent ebe1d7c336
commit 449ac2e5e4
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

@ -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.9.0",
"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",

22
yarn.lock
View File

@ -6973,21 +6973,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@7.1.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.1.0.tgz#b3e3304e890df45c827706831748935168ee839f"
integrity sha512-Y+MdOfsVQRGx0KcwSdNtwsFNGWUF7Zi7wPxUSa050J8eBlbkXUNFAyuSWviLJ5pUwzmp9XMEKD9Cdv+tGZG1ww==
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 "7.1.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2a688bdac828dc62916437d83c72cef1e525d5f9"
@ -7010,10 +6995,9 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
matrix-react-sdk@2.9.0:
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "2.9.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.9.0.tgz#4086422ee57bcb7f90a9d00e902136459dd78bee"
integrity sha512-SxA6fUuo4DINkNBcEx5nWuvQOo/5fm+oAI3QSECl6uAaefx2qKUc+tsB+Rdqe/IC/h6LDGmg4ljg9iPG95Ebuw==
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/511e0682fcd49fab9a508c7075b7100cefd4bcc4"
dependencies:
"@babel/runtime" "^7.8.3"
await-lock "^2.0.1"
@ -7041,7 +7025,7 @@ matrix-react-sdk@2.9.0:
is-ip "^2.0.0"
linkifyjs "^2.1.6"
lodash "^4.17.14"
matrix-js-sdk "7.1.0"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
minimist "^1.2.0"
pako "^1.0.5"
parse5 "^5.1.1"