From 763abc7af621b330dbafbd8f0efd3169a7d874cb Mon Sep 17 00:00:00 2001
From: Jordan Kohl <kohl.jordan@gmail.com>
Date: Wed, 16 Nov 2016 07:56:42 -0800
Subject: [PATCH] added changelog, plus version bump

---
 CHANGELOG.md | 9 +++++++++
 package.json | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..e621f38
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,9 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased](https://github.com/NativeAxis/nax-client-admin/compare/v1.1.0...HEAD)
+
+### Changed
+- [disabled react/prefer-stateless function](https://github.com/NativeAxis/eslint-config-nativeaxis/pull/3)
+- [updated from deprecated react/wrap-multiline to react/jsx-wrap-multilines](https://github.com/NativeAxis/eslint-config-nativeaxis/pull/3)
diff --git a/package.json b/package.json
index 7ac8170..cc20fb3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "eslint-config-nativeaxis",
-  "version": "1.0.0",
-  "description": "",
+  "version": "1.1.0",
+  "description": "ESLint config by Native Axis",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"