Merge master into develop

johnboxall · web-flow · commit 2ff30cc2e604 · 2018-10-16T10:57:33.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## To be released
+## v0.1.5 (October 16, 2018)
 - Add `overrideHttpPut` option for handling environments not allowing http put.
 
 ## v0.1.4 (June 21, 2018)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "commercecloud-ocapi-client",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "An ES6 JavaScript Client for Salesforce Open Commerce API",
   "license": "SEE LICENSE IN LICENSE",
   "main": "dist/commercecloud-ocapi-client.cjs.js",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## To be released`
	`1`	`+## v0.1.5 (October 16, 2018)`
`2`	`2`	- Add `overrideHttpPut` option for handling environments not allowing http put.
`3`	`3`
`4`	`4`	`## v0.1.4 (June 21, 2018)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "commercecloud-ocapi-client",`
`3`		`- "version": "0.1.4",`
	`3`	`+ "version": "0.1.5",`
`4`	`4`	`"description": "An ES6 JavaScript Client for Salesforce Open Commerce API",`
`5`	`5`	`"license": "SEE LICENSE IN LICENSE",`
`6`	`6`	`"main": "dist/commercecloud-ocapi-client.cjs.js",`