summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Trott <rtrott@gmail.com>2021-08-08 07:04:14 -0700
committerMichaël Zasso <targos@protonmail.com>2021-09-04 15:14:50 +0200
commit4b2eee5232fda44afe9ba337b93f3613453683a6 (patch)
treee18753a54b1ae4c7f49b351b16777683bfeaf752
parent6916a6c2b024a248325c6aa49e00415c39ec363c (diff)
downloadnode-new-4b2eee5232fda44afe9ba337b93f3613453683a6.tar.gz
meta: consolidate AUTHORS entries for ooHmartY
PR-URL: https://github.com/nodejs/node/pull/39705 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
-rw-r--r--.mailmap1
-rw-r--r--AUTHORS3
2 files changed, 2 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index a400b3efd4..e53d491090 100644
--- a/.mailmap
+++ b/.mailmap
@@ -305,6 +305,7 @@ Nitzan Uziely <linkgoron@gmail.com> <nitzan@testim.io>
Noah Rose Ledesma <noahroseledesma@seattleacademy.org>
Oluwaseun Omoyajowo <omoyajowo2015@gmail.com>
Onne Gorter <onne@onnlucky.com>
+Oscar Martinez <oscar@mtnz-web.com> <oscar.martinez@hautelook.com>
Paul Graham <homosaur@gmail.com> <paul@bytefair.com>
Paul Querna <pquerna@apache.org> <paul@querna.org>
Pedro Lima <pvsousalima@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index ffc7608edc..213c03ba9f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1205,7 +1205,7 @@ Daniel Pittman <daniel@pittmo.net>
Ian White <ian.white.developer@gmail.com>
Chris Bystrek <chris.bystrek@gmail.com>
Christine Hong <christine@dogvacay.com>
-Oscar Martinez <oscar.martinez@hautelook.com>
+Oscar Martinez <oscar@mtnz-web.com>
Aileen <avillanueva>
David Bradford <dbradf@gmail.com>
stokingerl <liamstokinger@gmail.com>
@@ -1480,7 +1480,6 @@ Tony Rice <tony@bestellensoftware.com>
Olivier Martin <olivier4.martin@orange.com>
jeyanthinath <jeyanthinath10@gmail.com>
Aditya Anand <aditya.anandmc@gmail.com>
-Oscar Martinez <oscar@mtnz-web.com>
cool88 <bhansur6@gmail.com>
Steven Lehn <sjlehn@gmail.com>
Łukasz Szewczak <lukaszewczak@gmail.com>