summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2020-07-21 16:01:51 -0600
committerCharles Harris <charlesr.harris@gmail.com>2020-07-21 16:01:51 -0600
commit9a948ad58ddd7e8bca4543a6473763fc524cae43 (patch)
treebb3f134b2d067f4089be6a6dae5d00168f5afd63 /.mailmap
parent82efaab1afb901767d007b618a140b0675fb86d6 (diff)
downloadnumpy-9a948ad58ddd7e8bca4543a6473763fc524cae43.tar.gz
REL: Update master after 1.19.1 release.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 6a700941b..ae221c020 100644
--- a/.mailmap
+++ b/.mailmap
@@ -66,6 +66,7 @@ Christoph Gohlke <cgohlke@uci.edu> cgholke <?@?>
Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
Christoph Gohlke <cgohlke@uci.edu> Christolph Gohlke <cgohlke@uci.edu>
Chunlin Fang <fangchunlin@huawei.com> Qiyu8 <fangchunlin@huawei.com>
+Chunlin Fang <fangchunlin@huawei.com> Chunlin <fangchunlin@huawei.com>
Colin Snyder <47012605+colinsnyder@users.noreply.github.com> colinsnyder <47012605+colinsnyder@users.noreply.github.com>
Daniel B Allan <daniel.b.allan@gmail.com> danielballan <daniel.b.allan@gmail.com>
Daniel da Silva <mail@danieldasilva.org> Daniel da Silva <daniel@meltingwax.net>
@@ -95,6 +96,7 @@ Erik M. Bray <erik.bray@lri.fr> Erik Bray <erik.m.bray@gmail.com>
Eric Fode <ericfode@gmail.com> Eric Fode <ericfode@linuxlaptop.(none)>
Eric Quintero <eric.antonio.quintero@gmail.com> e-q <eric.antonio.quintero@gmail.com>
Ernest N. Mamikonyan <ernest.mamikonyan@gmail.com> mamikony <ernest.mamikonyan@sig.com>
+Etienne Guesnet <etienne.guesnet.external@atos.net> EGuesnet <51407514+EGuesnet@users.noreply.github.com>
Evgeni Burovski <evgeny.burovskiy@gmail.com> Evgeni Burovski <evgeni@burovski.me>
Evgeny Toder <evgeny.toder@jpmorgan.com> eltjpm <evgeny.toder@jpmorgan.com>
Fernando Perez <Fernando.Perez@berkeley.edu> Fernando Perez <fperez@fperez.org>