Merge branch 'master' into auto-updater

This commit is contained in:
Yuya Ochiai
2018-12-19 23:21:01 +09:00
24 changed files with 2902 additions and 3940 deletions

View File

@@ -2,7 +2,7 @@
"name": "mattermost-desktop",
"productName": "Mattermost",
"desktopName": "Mattermost.desktop",
"version": "4.2.0-develop",
"version": "4.3.0-develop",
"description": "Mattermost",
"main": "main_bundle.js",
"author": "Mattermost, Inc. <feedback@mattermost.com>",