Merge branch 'master' into dev

2016-02-21 20:13:22 +09:00
parent 0da3580d26 0661caef55
commit e63e2bb362
7 changed files with 49 additions and 18 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "electron-mattermost",
-  "version": "1.0.5",
+  "version": "1.0.7",
  "description": "Electron-based desktop application for Mattermost",
  "main": "main.js",
  "author": "Yuya Ochiai",