merge develop

pull/6500/head
Matthew Hodgson 2018-04-15 23:55:09 +01:00
commit 7c1eafd050
3 changed files with 14 additions and 4 deletions

View File

@ -1,3 +1,13 @@
Changes in [0.14.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.1) (2018-04-12)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.0...v0.14.1)
* Remove presence management feature from labs
* Fix an issue where Riot would fail to load at all if certain
extensions were installed on Firefox
* Fix an issue where e2e cryptography could be disabled due to
a migration error.
Changes in [0.14.0](https://github.com/vector-im/riot-web/releases/tag/v0.14.0) (2018-04-11)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.0-rc.6...v0.14.0)

View File

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

View File

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "0.14.0",
"version": "0.14.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -68,8 +68,8 @@
"gfm.css": "^1.1.1",
"highlight.js": "^9.0.0",
"linkifyjs": "^2.1.3",
"matrix-js-sdk": "0.10.0",
"matrix-react-sdk": "0.12.1",
"matrix-js-sdk": "0.10.1",
"matrix-react-sdk": "0.12.2",
"modernizr": "^3.1.0",
"pako": "^1.0.5",
"prop-types": "^15.5.10",