Merge branch 'master' of https://github.com/smartsheet-platform/smartsheet-javascript-sdk into smartsheetgov

emilykoh · emilykoh · commit 94c1de4fe391 · 2019-02-11T14:58:28.000-08:00
# Conflicts:
#	CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Added constant for smartsheetgov
 - Updated documentation regarding the usage of baseUrl to clarify how clients can access smartsheetgov
 
+## 1.4.2 - February 11, 2019
+- Update `extend` dependency version to resolve security vulnerability
+
 ## 1.4.1 - December 7, 2018
 
 ### Security
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "smartsheet",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Smartsheet JavaScript client SDK",
   "main": "index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "smartsheet",`
`3`		`- "version": "1.4.1",`
	`3`	`+ "version": "1.4.2",`
`4`	`4`	`"description": "Smartsheet JavaScript client SDK",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`