Merge branch 'master' into release/v1.1.0

2016-03-22 23:24:04 +09:00
parent 960c5782bd ef8eebc8d0
commit ab18e33f7f
25 changed files with 229 additions and 74 deletions
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
 {
-  "name": "electron-mattermost",
+  "name": "mattermost-desktop",
+  "productName": "Mattermost",
  "version": "1.0.7",
-  "description": "Electron-based desktop application for Mattermost",
+  "description": "Mattermost Desktop application for Windows, Mac and Linux",
  "main": "main.js",
  "author": "Yuya Ochiai",
  "license": "MIT",