Merge branch 'master' of github.com:amclin/react-project-boilerplate into fix/kevin-test-run

developher-net · developher-net · commit 37e7df1e2885 · 2019-12-02T14:35:44.000-08:00
# Conflicts:
#	package-lock.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [3.6.1](https://github.com/amclin/react-project-boilerplate/compare/v3.6.0...v3.6.1) (2019-12-02)
+
+
+### Bug Fixes
+
+* **deps:** bump got from 9.6.0 to 10.0.1 ([295f250](https://github.com/amclin/react-project-boilerplate/commit/295f250c5edc280d75d6d3df62cd6823197c5d9a))
+
 # [3.6.0](https://github.com/amclin/react-project-boilerplate/compare/v3.5.1...v3.6.0) (2019-11-19)
 
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -168,7 +168,7 @@
     "cross-spawn": "7.0.1",
     "deepmerge": "^4.1.1",
     "git-user-name": "^2.0.0",
-    "got": "9.6.0",
+    "got": "10.0.1",
     "make-dir": "3.0.0",
     "promisepipe": "3.0.0",
     "prompts": "2.3.0",
