Adding changelog and bumping package

tedtate · tedtate · commit e61dd70bd2f2 · 2015-05-20T10:55:08.000-07:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -0,0 +1,7 @@
+2.1.0
+    - Add new rules to .eslintrc to closer match our JS style
+      guidelines.
+2.0.1
+    - Adds .eslintrc to allow usage of ESLint
+    - Adds Java code style guide
+    - Updates to CSS hybrid project conventions
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mobify-code-style",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Code style guide and linting tools for Mobify",
   "main": "index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "mobify-code-style",`
`3`		`- "version": "2.0.1",`
	`3`	`+ "version": "2.1.0",`
`4`	`4`	`"description": "Code style guide and linting tools for Mobify",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`