Merge branch 'master' into develop

# Conflicts:
#	package.json
#	yarn.lock
This commit is contained in:
RiotRobot 2022-08-16 16:18:38 +01:00
commit 5d0deff937
2 changed files with 32 additions and 1 deletions

View file

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