Merge release-v2.8.3 into master

johnboxall · web-flow · commit 0f28653327fc · 2017-05-31T12:02:47.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
+## v2.8.3 (May 31, 2017)
+- Set sass linting rules to un-ignore base styles
+
 ## v2.8.2 (May 31, 2017)
 - Provided more detailed linting error message in copyright header tool
-- Set sass linting rules to un-ignore base styles
 
 ## v2.8.1 (May 8, 2017)
 - Fixes whitespace / newline management in copyright tool
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mobify-code-style",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "description": "Code style guide and linting tools for Mobify",
   "repository": {
     "type": "git",

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.8.2",`
	`3`	`+ "version": "2.8.3",`
`4`	`4`	`"description": "Code style guide and linting tools for Mobify",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`