Merge branch 'develop' into olm_3.2.2

This commit is contained in:
Hubert Chathi
2021-05-21 16:26:18 -04:00
11 changed files with 34 additions and 39 deletions
+1 -1
View File
@@ -61,7 +61,7 @@
"katex": "^0.12.0",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"matrix-widget-api": "^0.1.0-beta.13",
"matrix-widget-api": "^0.1.0-beta.14",
"@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.2.tgz",
"prop-types": "^15.7.2",
"react": "^16.14.0",