Merge branch 'master' into develop

# Conflicts:
#	package.json
#	yarn.lock
This commit is contained in:
ElementRobot 2023-09-12 17:16:37 +01:00
commit 81b6320595
3 changed files with 46 additions and 8 deletions

View file

@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.11.40",
"version": "1.11.41",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {