From 9c6e4fec18688598d4ebc31096f2e3ca0516b734 Mon Sep 17 00:00:00 2001
From: Landon Abney <Landonabney@gmail.com>
Date: Wed, 10 May 2017 10:07:51 -0700
Subject: [PATCH] Prepare v3.1.2 release

---
 CHANGELOG.md | 12 ++++++++++++
 package.json |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 370e2d3..03bf190 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change Log
 
+## [v3.1.2](https://github.com/AtomLinter/linter-jshint/tree/v3.1.2) (2017-05-10)
+[Full Changelog](https://github.com/AtomLinter/linter-jshint/compare/v3.1.1...v3.1.2)
+
+**Implemented enhancements:**
+
+- Update flow-bin to version v0.46.0 🚀 [\#397](https://github.com/AtomLinter/linter-jshint/pull/397) ([greenkeeper[bot]](https://github.com/integration/greenkeeper))
+
+**Fixed bugs:**
+
+- "Disable when no jshintrc..." option still broken [\#396](https://github.com/AtomLinter/linter-jshint/issues/396)
+- Fix logic when there is a config file [\#398](https://github.com/AtomLinter/linter-jshint/pull/398) ([Arcanemagus](https://github.com/Arcanemagus))
+
 ## [v3.1.1](https://github.com/AtomLinter/linter-jshint/tree/v3.1.1) (2017-05-08)
 [Full Changelog](https://github.com/AtomLinter/linter-jshint/compare/v3.1.0...v3.1.1)
 
diff --git a/package.json b/package.json
index f1ae967..4c137ba 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "linter-jshint",
   "main": "./lib/main.js",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Linter plugin for JavaScript, using jshint",
   "repository": "https://github.com/AtomLinter/linter-jshint.git",
   "license": "MIT",