summaryrefslogtreecommitdiff
path: root/deps/npm/.mailmap
diff options
context:
space:
mode:
authorclaudiahdz <cghr1990@gmail.com>2019-09-03 17:51:04 -0500
committerRich Trott <rtrott@gmail.com>2019-09-17 18:51:21 -0700
commit17e420b23f5462db9f1951d98233fdaee889c721 (patch)
treec0f855138f734517aeba81000ebeac9d6e271563 /deps/npm/.mailmap
parent7fa03b54c88f930d24f2f0e2ceb0e94dc5a6ad77 (diff)
downloadnode-new-17e420b23f5462db9f1951d98233fdaee889c721.tar.gz
deps: update npm to 6.11.3
PR-URL: https://github.com/nodejs/node/pull/29430 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Diffstat (limited to 'deps/npm/.mailmap')
-rw-r--r--deps/npm/.mailmap18
1 files changed, 10 insertions, 8 deletions
diff --git a/deps/npm/.mailmap b/deps/npm/.mailmap
index a14e7b8287..725a59da65 100644
--- a/deps/npm/.mailmap
+++ b/deps/npm/.mailmap
@@ -2,13 +2,14 @@ Alex K. Wolfe <alexkwolfe@gmail.com>
Andrew Bradley <cspotcode@gmail.com>
Andrew Lunny <alunny@gmail.com>
Arlo Breault <arlolra@gmail.com>
-Ashley Williams <ashley@npmjs.com> <ashley@bocoup.com>
Ashley Williams <ashley@npmjs.com> <ashley666ashley@gmail.com>
+Ashley Williams <ashley@npmjs.com> <ashley@bocoup.com>
Benjamin Coe <bencoe@gmail.com>
Benjamin Coe <bencoe@gmail.com> <ben@npmjs.com>
Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
Cedric Nelson <cedric.nelson@gmail.com>
Charlie Robbins <charlie.robbins@gmail.com>
+Claudia Hernández <cghr1990@gmail.com>
Dalmais Maxence <root@ip-10-195-202-5.ec2.internal>
Danila Gerasimov <danila.gerasimov@gmail.com>
Dave Galbraith <dave@jut.io>
@@ -22,22 +23,23 @@ Evan Lucas <evan@btc.com> <evan.lucas@hattiesburgclinic.com>
Evan Lucas <evan@btc.com> <evanlucas@me.com>
Faiq Raza <faiqrazarizvi@gmail.com>
Forbes Lindesay <forbes@lindesay.co.uk>
-Forrest L Norvell <ogd@aoaioxxysz.net> <forrest@npmjs.com> <othiym23@gmail.com>
+Forrest L Norvell <ogd@aoaioxxysz.net> <forrest@npmjs.com>
+Forrest L Norvell <ogd@aoaioxxysz.net> <othiym23@gmail.com>
Gabriel Barros <descartavel1@gmail.com>
Geoff Flarity <geoff.flarity@gmail.com> <gflarity@raptvm-x02.(none)>
Gregers Gram Rygg <gregers.gram.rygg@finn.no>
Ifeanyi Oraelosi <ifeanyioraelosi@gmail.com>
-Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
-Isaac Z. Schlueter <i@izs.me>
-isaacs <i@izs.me>
+isaacs <i@izs.me> <i@foohack.com>
+isaacs <i@izs.me> <nope@not.real>
+isaacs <i@izs.me> <isaacs@npmjs.com>
Jake Verbaten <raynos2@gmail.com>
James Sanders <jimmyjazz14@gmail.com>
James Treworgy <jamietre@gmail.com>
Jason Smith <jhs@iriscouch.com>
Jed Fox <git@twopointzero.us>
+Jonas Weber <github@jonasw.de>
Joshua Bennett <legodudejb@gmail.com>
Joshua Bennett <legodudejb@gmail.com> <legodude17@users.noreply.github.com>
-Jonas Weber <github@jonasw.de>
Julien Meddah <julien.meddah@deveryware.com>
Kat Marchán <kzm@zkat.tech> <kzm@sykosomatic.org>
Kevin Lorenz <mail@kevinlorenz.com>
@@ -51,12 +53,12 @@ Max Goodman <c@chromakode.com>
Maxim Bogushevich <boga1@mail.ru>
Maximilian Antoni <mail@maxantoni.de> <maximilian.antoni@juliusbaer.com>
Michael Hayes <michael@hayes.io> <mhayes@newrelic.com>
-Nicolas Morel <marsup@gmail.com>
Misha Kaletsky <misha.kaletsky@gmail.com>
+Nicolas Morel <marsup@gmail.com>
Olivier Melcher <olivier.melcher@gmail.com>
Ra'Shaun Stovall <rashaunstovall@gmail.com>
-Rebecca Turner <me@re-becca.org> <turner@mikomi.org>
Rebecca Turner <me@re-becca.org> <rebecca@npmjs.com>
+Rebecca Turner <me@re-becca.org> <turner@mikomi.org>
Ryan Emery <seebees@gmail.com>
Sam Mikes <smikes@cubane.com>
Sreenivas Alapati <sreenivas9alapati@gmail.com>