mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'master' into develop

Browse source 
# Conflicts:
#	package.json
#	yarn.lock
This commit is contained in:
RiotRobot 2022-09-28 14:27:56 +01:00
commit fa966348ee
3 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
package.json
View file

@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.11.6",
"version": "1.11.7",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -61,8 +61,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": "19.7.0",
"matrix-react-sdk": "3.56.0",
"matrix-widget-api": "^1.1.1",
"prop-types": "^15.7.2",
"react": "17.0.2",