Merge branch 'develop' into export-conversations

This commit is contained in:
Jaiwanth
2021-06-08 18:43:03 +05:30
committed by GitHub
55 changed files with 1236 additions and 569 deletions
+2 -2
View File
@@ -5701,8 +5701,8 @@ mathml-tag-names@^2.1.3:
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "11.1.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/acb9bc8cc5234326a7583514a8e120a4ac42eedc"
version "11.2.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/35ecbed29d16982deff27a8c37b05167738225a2"
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"