Skip to content

Commit a41a14b

Browse files
committed
Merge branch 'master' into develop
2 parents 26955d2 + f76b30a commit a41a14b

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Changes in [1.0.7](https://github.com/vector-im/riot-web/releases/tag/v1.0.7) (2019-04-08)
2+
==========================================================================================
3+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.6...v1.0.7)
4+
5+
* Hotfix: bump js-sdk to 1.0.4, see https://github.com/matrix-org/matrix-js-sdk/releases/tag/v1.0.4
6+
17
Changes in [1.0.6](https://github.com/vector-im/riot-web/releases/tag/v1.0.6) (2019-04-01)
28
==========================================================================================
39
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.6-rc.1...v1.0.6)

electron_app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "riot-web",
33
"productName": "Riot",
44
"main": "src/electron-main.js",
5-
"version": "1.0.6",
5+
"version": "1.0.7",
66
"description": "A feature-rich client for Matrix.org",
77
"author": "New Vector Ltd.",
88
"dependencies": {

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "riot-web",
33
"productName": "Riot",
44
"main": "electron_app/src/electron-main.js",
5-
"version": "1.0.6",
5+
"version": "1.0.7",
66
"description": "A feature-rich client for Matrix.org",
77
"author": "New Vector Ltd.",
88
"repository": {
@@ -70,8 +70,8 @@
7070
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
7171
"gfm.css": "^1.1.2",
7272
"highlight.js": "^9.13.1",
73-
"matrix-js-sdk": "1.0.3",
74-
"matrix-react-sdk": "1.0.6",
73+
"matrix-js-sdk": "1.0.4",
74+
"matrix-react-sdk": "1.0.7",
7575
"modernizr": "^3.6.0",
7676
"olm": "https://matrix.org/packages/npm/olm/olm-3.1.0-pre3.tgz",
7777
"prop-types": "^15.6.2",

0 commit comments

Comments
 (0)