Merge branch 'master' into blur-webview-on-deactivation

2017-06-06 23:16:50 +09:00
parent bf21836c44 020f50f0fc
commit 63497009ec
3 changed files with 17 additions and 0 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,10 @@ Release date: TBD
 - Fixed desktop notifications not working when the window has been minimized from inactive state.
 [#522](https://github.com/mattermost/desktop/issues/522)

+#### Mac
+ - Fixed an issue where the text box didn't keep focus after uploading a file.
+ [#341](https://github.com/mattermost/desktop/issues/341)
+
 ---

 ## Release v3.7.0