Merge branch 'master' into develop

# Conflicts:
#	package.json
This commit is contained in:
RiotRobot 2022-09-13 13:11:15 +01:00
commit 6e2f66987c
3 changed files with 30 additions and 8 deletions

View file

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