Merge master into develop

johnboxall · web-flow · commit 3f9dc0fe2ce1 · 2017-11-03T11:31:54.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## To be released
+## v0.2.2 (November 3, 2017)
 - Add ASCII art
 - Add circleci/npm links to README
 - Fix npm package content in package.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocapi-client",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "An ES6 JavaScript Client for Salesforce Open Commerce API",
   "license": "SEE LICENSE IN LICENSE",
   "main": "lib/index.js",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## To be released`
	`1`	`+## v0.2.2 (November 3, 2017)`
`2`	`2`	`- Add ASCII art`
`3`	`3`	`- Add circleci/npm links to README`
`4`	`4`	`- Fix npm package content in package.json`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ocapi-client",`
`3`		`- "version": "0.2.1",`
	`3`	`+ "version": "0.2.2",`
`4`	`4`	`"description": "An ES6 JavaScript Client for Salesforce Open Commerce API",`
`5`	`5`	`"license": "SEE LICENSE IN LICENSE",`
`6`	`6`	`"main": "lib/index.js",`