Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2022-01-17 14:35:26 +00:00
commit aed3467fdf
3 changed files with 204 additions and 8 deletions

View file

@ -8037,9 +8037,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-analytics-events@https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1":
"matrix-analytics-events@git+https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1":
version "0.0.1"
resolved "https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1"
resolved "git+https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1"
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "15.3.0"
@ -8050,7 +8050,6 @@ mathml-tag-names@^2.1.3:
browser-request "^0.3.3"
bs58 "^4.0.1"
content-type "^1.0.4"
eslint-plugin-import "^2.25.2"
loglevel "^1.7.1"
p-retry "^4.5.0"
qs "^6.9.6"
@ -8086,7 +8085,6 @@ matrix-mock-request@^1.2.3:
emojibase-data "^6.2.0"
emojibase-regex "^5.1.3"
escape-html "^1.0.3"
eslint-plugin-import "^2.25.2"
file-saver "^2.0.5"
filesize "6.1.0"
flux "2.1.1"
@ -8102,7 +8100,7 @@ matrix-mock-request@^1.2.3:
lodash "^4.17.20"
maplibre-gl "^1.15.2"
matrix-analytics-events "https://github.com/matrix-org/matrix-analytics-events.git#1eab4356548c97722a183912fda1ceabbe8cc7c1"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
matrix-js-sdk "15.4.0"
matrix-widget-api "^0.1.0-beta.18"
minimist "^1.2.5"
opus-recorder "^8.0.3"