summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2017-01-13 14:24:48 -0500
committerSteve Klabnik <steve@steveklabnik.com>2017-01-13 14:24:48 -0500
commit9dedc815d97752f24a1073258d005d64c643ad80 (patch)
tree58d97f4def96515715863749121297ad529c3c7c /.mailmap
parentAuto merge of #38890 - petrochenkov:noresolve, r=nrc (diff)
downloadgrust-9dedc815d97752f24a1073258d005d64c643ad80.tar.gz
grust-9dedc815d97752f24a1073258d005d64c643ad80.tar.bz2
grust-9dedc815d97752f24a1073258d005d64c643ad80.tar.xz
update mailmap
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index e0759cb856..c5a9fe246a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -152,7 +152,7 @@ NAKASHIMA, Makoto <makoto.nksm+github@gmail.com>
152Nathan Wilson <wilnathan@gmail.com> 152Nathan Wilson <wilnathan@gmail.com>
153Nathaniel Herman <nherman@post.harvard.edu> Nathaniel Herman <nherman@college.harvard.edu> 153Nathaniel Herman <nherman@post.harvard.edu> Nathaniel Herman <nherman@college.harvard.edu>
154Neil Pankey <npankey@gmail.com> <neil@wire.im> 154Neil Pankey <npankey@gmail.com> <neil@wire.im>
155Nicholas Mazzuca <npmazzuca@gmail.com> Nicholas <npmazzuca@gmail.com> 155Nicole Mazzuca <npmazzuca@gmail.com> Nicole <npmazzuca@gmail.com>
156Nick Platt <platt.nicholas@gmail.com> 156Nick Platt <platt.nicholas@gmail.com>
157Nif Ward <nif.ward@gmail.com> 157Nif Ward <nif.ward@gmail.com>
158Oliver Schneider <oliver.schneider@kit.edu> oli-obk <github6541940@oli-obk.de> 158Oliver Schneider <oliver.schneider@kit.edu> oli-obk <github6541940@oli-obk.de>