mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'develop' of https://github.com/vector-im/element-web into export-conversations

Browse source
This commit is contained in:
Jaiwanth 2021-09-29 19:21:15 +05:30
commit dbecdc4f14
9 changed files with 150 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
yarn.lock
View file

@ -7693,8 +7693,8 @@ mathml-tag-names@^2.1.3:
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "12.5.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/348ea72b70d9abd23f5e06a82d36f3b35d0635c8"
version "13.0.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2515d07c8fc3bf5e1afc8352e3e330cca30dde85"
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"
@ -7716,8 +7716,8 @@ matrix-mock-request@^1.2.3:
expect "^1.20.2"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.30.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/2ffbf3aa72a166135923fd7fbbaf0c423ff4a156"
version "3.31.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/b635d017799e198fa0391e51af0b12e9d5843992"
dependencies:
"@babel/runtime" "^7.12.5"
"@sentry/browser" "^6.11.0"