Merge branch 'master' into dev

2016-02-12 23:56:06 +09:00
parent cec2b0f5dc f66e64f008
commit 459d696651
2 changed files with 2 additions and 2 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "electron-mattermost",
-  "version": "1.0.3",
+  "version": "1.0.4",
  "description": "Electron-based desktop application for Mattermost",
  "main": "main.js",
  "author": "Yuya Ochiai",
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
  "name": "electron-mattermost",
-  "version": "1.0.3",
+  "version": "1.0.4",
  "description": "Electron-based desktop application for Mattermost",
  "main": "main.js",
  "author": "Yuya Ochiai",