From 535e62704853b4a30bdaeeba591c4b19946c0c96 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Tue, 23 May 2017 18:47:38 -0400
Subject: [PATCH] Preps v3.5.0-beta.2

---
 CHANGELOG.md | 8 +++++++-
 README.md    | 7 +++++++
 package.json | 2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f54b879..b289a28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.5.0-beta.2] - 2017-05-23
+### Fixed
+- Fixes [#40](https://github.com/eamodio/vscode-gitlens/issues/40) - Encoding issues
+  - Given the limitations of the vscode api, I'm unable to fix all the encoding issues, but many of them should now be squashed
+  - `files.encoding` is now honored for the cases where the encoding cannot currently be gleaned
+
 ## [3.5.0-beta] - 2017-05-23
 ### Added
 - Improves performance
@@ -11,7 +17,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
   - Caches many more git commands to reduce git command roundtrips and parsing
   - Increases the debounce (delay) on cursor movement to reduce lag when navigating around a file
 - Adds diff information (previous line's code) into the active line hover when the current line is uncommitted
-- Adds `gitlens.statusBar.alignment` settings to control the alignment of the status bar -- thanks to Zack Schuster (@zackschuster)!
+- Adds `gitlens.statusBar.alignment` settings to control the alignment of the status bar -- thanks to [PR #72](https://github.com/eamodio/vscode-gitlens/pull/72) by Zack Schuster ([@zackschuster](https://github.com/zackschuster))!
 - Adds `Open Branch in Remote` command (`gitlens.openBranchInRemote`) - opens the current branch commits in the supported remote service
 - Adds `Open Repository in Remote` command (`gitlens.openRepoInRemote`) - opens the repository in the supported remote service
 - Adds support to the `Search commits` command (`gitlens.showCommitSearch`) to work without any active editor
diff --git a/README.md b/README.md
index 5e1885a..77fa50b 100644
--- a/README.md
+++ b/README.md
@@ -219,3 +219,10 @@ GitLens is highly customizable and provides many configuration settings to allow
 
 - If the `Copy to * clipboard` commands don't work on Linux -- `xclip` needs to be installed. You can install it via `sudo apt-get install xclip`
 - Visible whitespace causes issues ([vscode issue #11485](https://github.com/Microsoft/vscode/issues/11485)) with the `expanded` and `compact` blame annotation styles when using a non-monospace font -- set `"gitlens.advanced.toggleWhitespace.enabled": true` if you are using a non-monospace font
+
+## Contributors
+
+A big thanks to the people that have contributed to this project:
+
+- Aurelio Ogliari ([@nobitagit](https://github.com/nobitagit)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=nobitagit)
+- Zack Schuster ([@zackschuster](https://github.com/zackschuster)) — [contributions](https://github.com/eamodio/vscode-gitlens/commits?author=zackschuster)
diff --git a/package.json b/package.json
index 52ce724..0cb5199 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "gitlens",
-    "version": "3.5.0-beta",
+    "version": "3.5.0-beta.2",
     "author": {
         "name": "Eric Amodio",
         "email": "eamodio@gmail.com"