Merge branch 'release/v1.2.0' into develop

* release/v1.2.0: Updated Changelog Updated version to 1.2.0
larsonjj · Aug 20, 2015 · 745f63c · 745f63c
2 parents 84479a7 + 6da45c8
commit 745f63c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### v1.2.0:
+#### date: 2015-8-19
+##### changes:
+* Updated documentation
+* Seperated gulp tasks into their own files
+
 ### v1.1.0:
 #### date: 2015-8-13
 ##### changes:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-neopolitan",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A generator for creating React applications. Helps you harness the power of your favorite tools: React, React-Router, Baobab, ES6/2015, Gulp, and much more!",
   "keywords": [
     "yeoman-generator",