From f9d2019ae8ffe6f3db0dec2996921fb8ec9ad43d Mon Sep 17 00:00:00 2001
From: Yannick Croissant <yannick.croissant@gmail.com>
Date: Sun, 22 Mar 2015 22:19:27 +0000
Subject: [PATCH] Update History and bump version

---
 History.md   | 15 +++++++++++++++
 package.json |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index ea45255877..fc9f6436b0 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,18 @@
+1.6.0 / 2015-03-22
+==================
+* update dependencies
+* add jsx-no-undef rule
+* add jsx-quotes rule ([#12][]) 
+* add @jsx pragma support ([#23][])
+* fix react-in-jsx-scope in Node.js env
+* fix usage of propTypes with an external object ([#9][])
+* allow this.getState references (not calls) in lifecycle methods ([#22][] @benmosher)
+
+[#12]: https://github.com/yannickcr/eslint-plugin-react/issues/12
+[#23]: https://github.com/yannickcr/eslint-plugin-react/issues/23
+[#9]: https://github.com/yannickcr/eslint-plugin-react/issues/9
+[#22]: https://github.com/yannickcr/eslint-plugin-react/pull/22
+
 1.5.0 / 2015-03-14
 ==================
 * add jsx-uses-vars rule
diff --git a/package.json b/package.json
index b7a0df2922..c306eee17e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "author": "Yannick Croissant <yannick.croissant+npm@gmail.com>",
   "description": "React specific linting rules for ESLint",
   "main": "index.js",