Merge branch 'master' into develop
# Conflicts: # yarn.lock
This commit is contained in:
commit
f2787855fd
3 changed files with 40 additions and 10 deletions
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "element-web",
|
||||
"version": "1.11.15",
|
||||
"version": "1.11.16",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"repository": {
|
||||
|
@ -60,8 +60,8 @@
|
|||
"gfm.css": "^1.1.2",
|
||||
"jsrsasign": "^10.5.25",
|
||||
"katex": "^0.16.0",
|
||||
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
|
||||
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
|
||||
"matrix-js-sdk": "22.0.0",
|
||||
"matrix-react-sdk": "3.62.0",
|
||||
"matrix-widget-api": "^1.1.1",
|
||||
"react": "17.0.2",
|
||||
"react-dom": "17.0.2",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue