Merge remote-tracking branch 'origin' into sentry-rageshakes

This commit is contained in:
James Salter
2021-08-17 11:47:00 +01:00
87 changed files with 2998 additions and 1463 deletions
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "matrix-react-sdk",
"version": "3.27.0",
"version": "3.28.1",
"description": "SDK for matrix.org using React",
"author": "matrix.org",
"repository": {
@@ -82,7 +82,7 @@
"katex": "^0.12.0",
"linkifyjs": "^2.1.9",
"lodash": "^4.17.20",
"matrix-js-sdk": "12.2.0",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-widget-api": "^0.1.0-beta.15",
"minimist": "^1.2.5",
"opus-recorder": "^8.0.3",
@@ -151,7 +151,7 @@
"@typescript-eslint/eslint-plugin": "^4.17.0",
"@typescript-eslint/parser": "^4.17.0",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
"allchange": "github:matrix-org/allchange",
"allchange": "^1.0.0",
"babel-jest": "^26.6.3",
"chokidar": "^3.5.1",
"concurrently": "^5.3.0",