diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-02-09 12:14:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-09 12:14:21 -0500 |
| commit | 711b95f6b129e13dbbc6a8f9dbf649275bcad25e (patch) | |
| tree | a99e5b55c79d50f31d8aaca9b1df34ef0b0c504e | |
| parent | 3eaca413fe44dbd4e59c648a14efa8a2888622b0 (diff) | |
| parent | 0dbdb2d0d08818ffe61ab0c1024356957ba0a543 (diff) | |
| download | rust-711b95f6b129e13dbbc6a8f9dbf649275bcad25e.tar.gz rust-711b95f6b129e13dbbc6a8f9dbf649275bcad25e.zip | |
Rollup merge of #39670 - JanZerebecki:fix-mailmap-gifnksm, r=steveklabnik
Fix mailmap for @gifnksm cc rust-lang-nursery/thanks#71
| -rw-r--r-- | .mailmap | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/.mailmap b/.mailmap index 1ae0aae2d01..4b4f343d15a 100644 --- a/.mailmap +++ b/.mailmap @@ -132,9 +132,8 @@ Lindsey Kuper <lindsey@composition.al> <lkuper@mozilla.com> Luke Metz <luke.metz@students.olin.edu> Luqman Aden <me@luqman.ca> <laden@csclub.uwaterloo.ca> Luqman Aden <me@luqman.ca> <laden@mozilla.com> -Makoto Nakashima <makoto.nksm+github@gmail.com> <makoto.nksm@gmail.com> -Makoto Nakashima <makoto.nksm+github@gmail.com> gifnksm <makoto.nksm+github@gmail.com> -Makoto Nakashima <makoto.nksm+github@gmail.com> NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> +NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm@gmail.com> +NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm+github@gmail.com> Marcell Pardavi <marcell.pardavi@gmail.com> Margaret Meyerhofer <mmeyerho@andrew.cmu.edu> <mmeyerho@andrew> Mark Sinclair <mark.edward.x@gmail.com> @@ -150,7 +149,6 @@ Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail> Mickaël Raybaud-Roig <raybaudroigm@gmail.com> m-r-r <raybaudroigm@gmail.com> Ms2ger <ms2ger@gmail.com> <Ms2ger@gmail.com> Mukilan Thiagarajan <mukilanthiagarajan@gmail.com> -NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> Nathan Wilson <wilnathan@gmail.com> Nathaniel Herman <nherman@post.harvard.edu> Nathaniel Herman <nherman@college.harvard.edu> Neil Pankey <npankey@gmail.com> <neil@wire.im> |