phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'release-3.7' into merge-release-3.7

Browse Source
This commit is contained in:
Yuya Ochiai
2017-09-06 00:52:14 +09:00
parent 2399235fce 3f898f4927
commit cb37f323cf
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "mattermost-desktop", "name": "mattermost-desktop",
"productName": "Mattermost", "productName": "Mattermost",
"version": "3.7.0", "version": "3.7.1",
"description": "Mattermost", "description": "Mattermost",
"main": "main.js", "main": "main.js",
"author": "Mattermost, Inc. <feedback@mattermost.com>", "author": "Mattermost, Inc. <feedback@mattermost.com>",
@@ -44,7 +44,7 @@
"cross-env": "^4.0.0", "cross-env": "^4.0.0",
"css-loader": "^0.28.1", "css-loader": "^0.28.1",
"devtron": "^1.4.0", "devtron": "^1.4.0",
"electron": "1.6.10", "electron": "1.6.11",
"electron-builder": "17.4.0", "electron-builder": "17.4.0",
"electron-builder-squirrel-windows": "17.4.0", "electron-builder-squirrel-windows": "17.4.0",
"electron-connect": "^0.6.1", "electron-connect": "^0.6.1",

2
src/package.json
View File

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