diff options
| author | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2019-12-28 00:36:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-28 00:36:18 +0100 |
| commit | 65bbcf0e13d0ce81f443b2fcfc5548b589c8462e (patch) | |
| tree | 280371e5569301f96fa6ed0a2498625a90795e28 | |
| parent | 335c887721654c96eac1a61903489ef56b9e159f (diff) | |
| parent | e518e385641ec8c4b2e1fc082c117ded14157f0c (diff) | |
| download | rust-65bbcf0e13d0ce81f443b2fcfc5548b589c8462e.tar.gz rust-65bbcf0e13d0ce81f443b2fcfc5548b589c8462e.zip | |
Rollup merge of #67664 - Manishearth:mailmapfixes, r=Mark-Simulacrum
Fix some mailmap entries r? @pietroalbini
| -rw-r--r-- | .mailmap | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap index aae034dd938..3e512377d03 100644 --- a/.mailmap +++ b/.mailmap @@ -155,6 +155,7 @@ 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> +Manish Goregaokar <manishsmail@gmail.com> Marcell Pardavi <marcell.pardavi@gmail.com> Margaret Meyerhofer <mmeyerho@andrew.cmu.edu> <mmeyerho@andrew> Mark Rousskov <mark.simulacrum@gmail.com> @@ -186,6 +187,7 @@ Neil Pankey <npankey@gmail.com> <neil@wire.im> Nick Platt <platt.nicholas@gmail.com> Nicole Mazzuca <npmazzuca@gmail.com> Nif Ward <nif.ward@gmail.com> +Nika Layzell <michael@thelayzells.com> Oliver Middleton <olliemail27@gmail.com> <ollie27@users.noreply.github.com> Oliver Scherer <oliver.schneider@kit.edu> <git-spam-no-reply9815368754983@oli-obk.de> Oliver Scherer <oliver.schneider@kit.edu> <git-spam9815368754983@oli-obk.de> @@ -205,7 +207,6 @@ Paul Faria <paul_faria@ultimatesoftware.com> Paul Faria <Nashenas88@gmail.com> Peer Aramillo Irizar <peer.aramillo.irizar@gmail.com> parir <peer.aramillo.irizar@gmail.com> Peter Elmers <peter.elmers@yahoo.com> <peter.elmers@rice.edu> Peter Liniker <peter.liniker+github@gmail.com> -Peter Zotov <whitequark@whitequark.org> Phil Dawes <phil@phildawes.net> Phil Dawes <pdawes@drw.com> Philipp Brüschweiler <blei42@gmail.com> <blei42@gmail.com> Philipp Brüschweiler <blei42@gmail.com> <bruphili@student.ethz.ch> @@ -256,6 +257,7 @@ Ulrik Sverdrup <bluss@users.noreply.github.com> Ulrik Sverdrup <root@localhost> Vadim Petrochenkov <vadim.petrochenkov@gmail.com> Vadim Petrochenkov <vadim.petrochenkov@gmail.com> petrochenkov <vadim.petrochenkov@gmail.com> Vitali Haravy <HumaneProgrammer@gmail.com> Vitali Haravy <humaneprogrammer@gmail.com> +whitequark <whitequark@whitequark.org> William Ting <io@williamting.com> <william.h.ting@gmail.com> Xuefeng Wu <benewu@gmail.com> Xuefeng Wu <xfwu@thoughtworks.com> Xuefeng Wu <benewu@gmail.com> XuefengWu <benewu@gmail.com> |