From 1a7aa2bc55a02ce232167d5d9a879e393e53c873 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2019 11:58:21 +0000 Subject: [PATCH] Bump merge from 1.2.0 to 1.2.1 Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/yeikos/js.merge/releases) - [Commits](https://github.com/yeikos/js.merge/compare/v1.2.0...v1.2.1) Signed-off-by: dependabot[bot] --- yarn.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index 13f1872..bd9e8c0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3840,10 +3840,10 @@ https-proxy-agent@^2.2.1: agent-base "^4.1.0" debug "^3.1.0" -hull-client@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/hull-client/-/hull-client-1.2.2.tgz#9e75db326957513babd4c793482e7d0903cdf490" - integrity sha512-KFsBGwL/Q6jH33kRA+9F8cY+xvfkWBru+7oJpHMpQ4C4cBMi79yqQFhukUQyxanoS4pS8m9CGHR3rQKFlJYfdw== +hull-client@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/hull-client/-/hull-client-1.2.4.tgz#755365c0cdc1ab199f353cecfb9cd8737a387dee" + integrity sha512-AcON3AsV+1Zecy7gjCrjRiWTMschKbHFFnu2PRko6olNvM19UfkvNKs/1WSZTXc0LW3yuW0w9XfCTn5X+kgKRA== dependencies: jwt-simple "^0.5.0" lodash "^4.17.5" @@ -3852,10 +3852,10 @@ hull-client@^1.2.2: uuid "^3.0.1" winston "^2.2.0" -hull@0.13.17: - version "0.13.17" - resolved "https://registry.yarnpkg.com/hull/-/hull-0.13.17.tgz#01efd2af682918ae0717ba3497df31319619f3e9" - integrity sha512-nZGI65CanQOEIljUq2MxIi9ToR6LWALjEkqh0D09vhvzNJH2kwumYIRvXg3m0dQnpAGIiZQIupRXewtNMekpXw== +hull@0.13.20: + version "0.13.20" + resolved "https://registry.yarnpkg.com/hull/-/hull-0.13.20.tgz#0b602cc809ba519255060430060e424fdd50a5f7" + integrity sha512-mfbLE1kkRkD+i6t6tH0SOmn/d8dBYCz72NMIg2lxcgr5sXK5BpEOg0UCn1l0yedAxrf2P2mmBWTe9GsBwf4Hyw== dependencies: JSONStream "^1.1.2" aws-sdk "^2.81.0" @@ -3873,7 +3873,7 @@ hull@0.13.17: del "^2.2.1" dogapi "^2.6.0" ejs "^2.5.6" - hull-client "^1.2.2" + hull-client "1.2.4" jsonwebtoken "^7.4.3" jwt-simple "^0.5.0" kue "^0.11.5" @@ -4885,9 +4885,9 @@ merge-descriptors@1.0.1: integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= merge@^1.1.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da" - integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo= + version "1.2.1" + resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" + integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ== method-override@~2.3.5: version "2.3.10"