Merge branch 'master' into develop

Marlow Payne · Marlow Payne · commit 0dea88dff486 · 2016-08-17T09:35:50.000-07:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
-Pending Release
+2.5.3
     - Fix #123 by using react/jsx-wrap-multilines rule
+    - Migrate CSSComb documentation from Confluence to code style repo
 2.5.2
     - Fix #43 by updating all underlines in Sass code examples
     - Fix #114 by removing invalid options from CSSComb config file
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mobify-code-style",
-  "version": "2.5.2",
+  "version": "2.5.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.5.2",`
	`3`	`+ "version": "2.5.3",`
`4`	`4`	`"description": "Code style guide and linting tools for Mobify",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`