Merge remote-tracking branch 'origin/develop' into develop

2017-11-10 15:21:04 +00:00 · 2017-11-10 15:21:04 +00:00 · 25bff3f4b1
parent 71d0ecf37d 0630d856f8
commit 25bff3f4b1
1 changed files with 1 additions and 1 deletions
--- 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.7",
+  "version": "0.13.0-rc.1",
  "description": "A feature-rich client for Matrix.org",
  "author": "Vector Creations Ltd.",
  "dependencies": {