Merge branch 'main' into matroska

2022-07-13 15:54:06 -04:00
parent d5e638c8f7 a3e4d6998f
commit 7fab4ca1ba
34 changed files with 4059 additions and 3874 deletions
--- a/package.json
+++ b/package.json
@@ -38,12 +38,12 @@
    "classnames": "^2.3.1",
    "color-hash": "^2.0.1",
    "events": "^3.3.0",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#ebcb26f1b3b9e2d709615fde03f9ce6ac77871f1",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#984dd26a138411ef73903ff4e635f2752e0829f2",
    "matrix-widget-api": "^0.1.0-beta.18",
    "mermaid": "^8.13.8",
    "normalize.css": "^8.0.1",
    "pako": "^2.0.4",
-    "postcss-preset-env": "^6.7.0",
+    "postcss-preset-env": "^7",
    "re-resizable": "^6.9.0",
    "react": "^17.0.0",
    "react-dom": "^17.0.0",