Merge branch 'master' into develop

pull/9075/head
David Baker 3 years ago
commit acb8afaeb7
  1. 6
      CHANGELOG.md
  2. 2
      electron_app/package.json
  3. 2
      package-lock.json
  4. 4
      package.json

@ -1,3 +1,9 @@
Changes in [1.0.3](https://github.com/vector-im/riot-web/releases/tag/v1.0.3) (2019-03-06)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2...v1.0.3)
* react-sdk 1.0.3 to fix ctrl+k shortcut and room list bugs
Changes in [1.0.2](https://github.com/vector-im/riot-web/releases/tag/v1.0.2) (2019-03-06)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2-rc.3...v1.0.2)

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

2
package-lock.json generated

@ -1,6 +1,6 @@
{
"name": "riot-web",
"version": "1.0.2",
"version": "1.0.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "1.0.2",
"version": "1.0.3",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -71,7 +71,7 @@
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "1.0.1",
"matrix-react-sdk": "1.0.2",
"matrix-react-sdk": "1.0.3",
"modernizr": "^3.6.0",
"prop-types": "^15.6.2",
"react": "^15.6.0",

Loading…
Cancel
Save