Merge pull request #933 from palantir/v3.3.0-dev.1

Prepare release v3.3.0-dev.1
palantir · Jan 22, 2016 · dc3ee5b · dc3ee5b
2 parents e3f35d8 + 1c6d3b7
commit dc3ee5b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Change Log
 ===
 
+v3.3.0-dev.1
+---
+* [bugfix] Correctly handle more than one custom rules directory (#928)
+
 v3.2.2
 ---
 * Stable release containing changes from the last dev release

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tslint",
-  "version": "3.2.2-dev.1",
+  "version": "3.3.0-dev.1",
   "description": "a static analysis linter for TypeScript",
   "bin": {
     "tslint": "./bin/tslint"

diff --git a/src/tslint.ts b/src/tslint.ts
@@ -25,7 +25,7 @@ import {ILinterOptions, LintResult} from "./lint";
 import {loadRules} from "./ruleLoader";
 
 class Linter {
-    public static VERSION = "3.2.2-dev.1";
+    public static VERSION = "3.3.0-dev.1";
     public static findConfiguration = config;
 
     private fileName: string;