Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2021-01-26 12:31:31 +00:00
commit 030fe38834
2 changed files with 7 additions and 1 deletions

View file

@ -1,3 +1,9 @@
Changes in [1.7.18](https://github.com/vector-im/element-desktop/releases/tag/v1.7.18) (2021-01-26)
===================================================================================================
[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.17...v1.7.18)
* No changes since 1.7.17
Changes in [1.7.17](https://github.com/vector-im/element-desktop/releases/tag/v1.7.17) (2021-01-18)
===================================================================================================
[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.17-rc.1...v1.7.17)

View file

@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.17",
"version": "1.7.18",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {