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

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

Browse source
This commit is contained in:
Jaiwanth 2021-08-04 11:11:42 +05:30
commit c3995eea5e
10 changed files with 180 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

18
yarn.lock
View file

@ -4251,9 +4251,9 @@ eslint-config-google@^0.14.0:
resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz#4f5f8759ba6e11b424294a219dbfa18c508bcc1a"
integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==
"eslint-plugin-matrix-org@github:matrix-org/eslint-plugin-matrix-org#main":
version "0.3.3"
resolved "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/50d6bdf6704dd95016d5f1f824f00cac6eaa64e1"
"eslint-plugin-matrix-org@github:matrix-org/eslint-plugin-matrix-org#2306b3d4da4eba908b256014b979f1d3d43d2945":
version "0.3.5"
resolved "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/2306b3d4da4eba908b256014b979f1d3d43d2945"
eslint-plugin-react-hooks@^4.2.0:
version "4.2.0"
@ -7307,9 +7307,9 @@ mathml-tag-names@^2.1.3:
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
matrix-js-sdk@12.1.0, "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "12.1.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e85038e88898a3a1be432fc3d53d540c8250c021"
matrix-js-sdk@12.2.0, "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "12.2.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/8a1bc98d4eb5cecd9373ed067c9fbfb6718d2e4f"
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"
@ -7331,8 +7331,8 @@ matrix-mock-request@^1.2.3:
expect "^1.20.2"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.26.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/80e64601a970d972d02df286abb8de3d3f231eba"
version "3.27.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/e2ef5d1737acda03c186560182fa7daddff8479b"
dependencies:
"@babel/runtime" "^7.12.5"
await-lock "^2.1.0"
@ -7360,7 +7360,7 @@ matrix-mock-request@^1.2.3:
katex "^0.12.0"
linkifyjs "^2.1.9"
lodash "^4.17.20"
matrix-js-sdk "12.1.0"
matrix-js-sdk "12.2.0"
matrix-widget-api "^0.1.0-beta.15"
minimist "^1.2.5"
opus-recorder "^8.0.3"