Merge master into develop

johnboxall · web-flow · commit 0c876a1920b5 · 2017-10-31T14:54:23.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## To be released
+## v2.8.4 (October 31, 2017)
 - Add support to copyright tooling for TypeScript files (.ts, .tsx) [#164](https://github.com/mobify/mobify-code-style/pull/164)
 
 ## v2.8.3 (May 31, 2017)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mobify-code-style",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "Code style guide and linting tools for Mobify",
   "repository": {
     "type": "git",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## To be released`
	`1`	`+## v2.8.4 (October 31, 2017)`
`2`	`2`	`- Add support to copyright tooling for TypeScript files (.ts, .tsx) [#164](https://github.com/mobify/mobify-code-style/pull/164)`
`3`	`3`
`4`	`4`	`## v2.8.3 (May 31, 2017)`
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.3",`
	`3`	`+ "version": "2.8.4",`
`4`	`4`	`"description": "Code style guide and linting tools for Mobify",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`