Merge branch 'release-4.1'

CHANGELOG.md

@@ -16,11 +16,19 @@ Release date: TBD
 
 ### Bug Fixes
 
+----
+
+## Release v4.1.2
+
+Release date: May 25, 2018
+
+### Bug Fixes
+
 #### All Platforms
- - Fixed authentication dialog not working.
+ - Fixed an issue where the popup dialog to authenticate a user to their proxy or server didn't work.
  [#809](https://github.com/mattermost/desktop/issues/809)
 
-----
+---
 
 ## Release v4.1.1
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mattermost-desktop",
   "productName": "Mattermost",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "Mattermost",
   "main": "main.js",
   "author": "Mattermost, Inc. <feedback@mattermost.com>",

src/package.json

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