gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
David Baker 2018-05-18 12:41:30 +01:00
parent 2e7da36af0 ec62b5f03c
commit 66ca9a355b
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CHANGELOG.md
View File

@ -1,3 +1,14 @@
Changes in [0.15.3](https://github.com/vector-im/riot-web/releases/tag/v0.15.3) (2018-05-18)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.2...v0.15.3)
* Fix right click menu in electron
[\#6763](https://github.com/vector-im/riot-web/pull/6763)
* Update to electron 2.0.1
[\#6764](https://github.com/vector-im/riot-web/pull/6764)
* Hide URL options for e2e blob: URL images
[\#6765](https://github.com/vector-im/riot-web/pull/6765)
Changes in [0.15.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.2) (2018-05-17)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.1...v0.15.2)

2
electron_app/package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "0.15.2",
"version": "0.15.3",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {

2
package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "0.15.2",
"version": "0.15.3",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {