v0.12.6

Prepare changelog for v0.12.6
v0.12.6
2017-09-21 21:53:09 +01:00 · 2017-09-21 21:53:09 +01:00 · 2017-09-21 21:50:48 +01:00 · 2017-09-21 21:49:43 +01:00 · 2017-09-21 18:08:17 +01:00 · 2017-09-21 18:08:17 +01:00
3 changed files with 16 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+Changes in [0.12.6](https://github.com/vector-im/riot-web/releases/tag/v0.12.6) (2017-09-21)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.5...v0.12.6)
+
+ * Use matrix-js-sdk v0.8.4 to fix build
+
+Changes in [0.12.5](https://github.com/vector-im/riot-web/releases/tag/v0.12.5) (2017-09-21)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.4...v0.12.5)
+
+ * Use react-sdk v0.10.5 to fix build
+
 Changes in [0.12.4](https://github.com/vector-im/riot-web/releases/tag/v0.12.4) (2017-09-20)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.4-rc.1...v0.12.4)
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "src/electron-main.js",
-  "version": "0.12.4",
+  "version": "0.12.6",
  "description": "A feature-rich client for Matrix.org",
  "author": "Vector Creations Ltd.",
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "electron_app/src/electron-main.js",
-  "version": "0.12.4",
+  "version": "0.12.6",
  "description": "A feature-rich client for Matrix.org",
  "author": "Vector Creations Ltd.",
  "repository": {
@@ -66,8 +66,8 @@
    "gfm.css": "^1.1.1",
    "highlight.js": "^9.0.0",
    "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.8.3",
-    "matrix-react-sdk": "0.10.4",
+    "matrix-js-sdk": "0.8.4",
+    "matrix-react-sdk": "0.10.6",
    "modernizr": "^3.1.0",
    "pako": "^1.0.5",
    "prop-types": "^15.5.10",
Author	SHA1	Message	Date
David Baker	2b7ee756f8	v0.12.6	2017-09-21 21:53:09 +01:00
David Baker	b25075974c	Prepare changelog for v0.12.6	2017-09-21 21:53:09 +01:00
David Baker	af3feccc2d	v0.12.6	2017-09-21 21:50:48 +01:00
David Baker	aaff9133c7	Newer js-sdk & react-sdk for js-sdk build fix	2017-09-21 21:49:43 +01:00
David Baker	fbccf22e00	v0.12.5	2017-09-21 18:08:17 +01:00
David Baker	e8c347a755	Prepare changelog for v0.12.5	2017-09-21 18:08:17 +01:00
David Baker	f450ce422e	v0.12.5	2017-09-21 18:06:03 +01:00
David Baker	874e88c4a8	react-sdk v0.10.5	2017-09-21 18:05:22 +01:00