From 05690415a41132e6c0b7ebeab7687ee3730ae5a9 Mon Sep 17 00:00:00 2001
From: Jason Killian <JKillian@users.noreply.github.com>
Date: Sat, 25 Jun 2016 19:00:59 -0400
Subject: [PATCH] Prepare release v3.12.1 (#1348)

---
 CHANGELOG.md  | 8 ++++++++
 package.json  | 2 +-
 src/tslint.ts | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83eafcec867..e19c2647b95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 Change Log
 ===
 
+v3.12.1
+---
+* Stable release containing changes from the last dev release (v3.12.0-dev.1)
+
+v3.12.0-dev.1
+---
+* [bugfix] Fix null reference bug in typedef rule (#1345)
+
 v3.12.0
 ---
 * Stable release containing changes from the last dev release (v3.12.0-dev.0)
diff --git a/package.json b/package.json
index 616988e6108..d454dd84ca4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tslint",
-  "version": "3.12.0",
+  "version": "3.12.1",
   "description": "An extensible static analysis linter for the TypeScript language",
   "bin": {
     "tslint": "./bin/tslint"
diff --git a/src/tslint.ts b/src/tslint.ts
index 6f98ff81548..7b7df3586dd 100644
--- a/src/tslint.ts
+++ b/src/tslint.ts
@@ -33,7 +33,7 @@ import { loadRules } from "./ruleLoader";
 import { arrayify } from "./utils";
 
 class Linter {
-    public static VERSION = "3.12.0";
+    public static VERSION = "3.12.1";
 
     public static findConfiguration = findConfiguration;
     public static findConfigurationPath = findConfigurationPath;