Merge branch 'master' into develop

# Conflicts:
#	package.json
#	yarn.lock
This commit is contained in:
RiotRobot
2022-11-29 15:28:13 +00:00
2 changed files with 35 additions and 1 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
"version": "1.11.14",
"version": "1.11.15",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {