summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2017-01-24 17:22:00 -0500
committerSteve Klabnik <steve@steveklabnik.com>2017-01-24 17:22:00 -0500
commit249b444efa356c252b264c56ba5041d70d0b9734 (patch)
tree1905a73b649d193dde2d0b56526c7549bb55d247 /.mailmap
parentAuto merge of #39222 - GuillaumeGomez:rustdoc_where, r=frewsxcv,steveklabnik,... (diff)
downloadgrust-249b444efa356c252b264c56ba5041d70d0b9734.tar.gz
grust-249b444efa356c252b264c56ba5041d70d0b9734.tar.bz2
grust-249b444efa356c252b264c56ba5041d70d0b9734.tar.xz
fix mailmap
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index c5a9fe246a..be18190e12 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>
155Nicole Mazzuca <npmazzuca@gmail.com> Nicole <npmazzuca@gmail.com> 155Nicole Mazzuca <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>