diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-08-30 23:07:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-30 23:07:59 +0200 |
| commit | f6e43e8100c0e07e0581a3b1ced68460cb11b23a (patch) | |
| tree | 1aee3e1e9e2c04705174e4cc27039d64315a4be5 | |
| parent | c96a677c39684585cc7fa17f9f0514a6c4c0372f (diff) | |
| parent | c6e7f039aabe3338c400d197a689c94bde425ba6 (diff) | |
| download | rust-f6e43e8100c0e07e0581a3b1ced68460cb11b23a.tar.gz rust-f6e43e8100c0e07e0581a3b1ced68460cb11b23a.zip | |
Rollup merge of #63600 - rust-lang:oli-obk-patch-1, r=Mark-Simulacrum
Merge oli-obk mail addresses
| -rw-r--r-- | .mailmap | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/.mailmap b/.mailmap index 72c76006f7c..da8044de405 100644 --- a/.mailmap +++ b/.mailmap @@ -184,12 +184,19 @@ 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> -Oliver Schneider <oliver.schneider@kit.edu> oli-obk <github6541940@oli-obk.de> -Oliver Schneider <oliver.schneider@kit.edu> Oliver 'ker' Schneider <rust19446194516@oli-obk.de> -Oliver Schneider <oliver.schneider@kit.edu> Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de> -Oliver Schneider <oliver.schneider@kit.edu> Oliver Schneider <git-spam9815368754983@oli-obk.de> -Oliver Schneider <oliver.schneider@kit.edu> Oliver Schneider <github333195615777966@oli-obk.de> -Oliver Schneider <oliver.schneider@kit.edu> Oliver Schneider <github6541940@oli-obk.de> +Oliver Scherer <oliver.schneider@kit.edu> <git-spam-no-reply9815368754983@oli-obk.de> +Oliver Scherer <oliver.schneider@kit.edu> <git-spam9815368754983@oli-obk.de> +Oliver Scherer <oliver.schneider@kit.edu> <github333195615777966@oli-obk.de> +Oliver Scherer <oliver.schneider@kit.edu> <github6541940@oli-obk.de> +Oliver Scherer <oliver.schneider@kit.edu> <rust19446194516@oli-obk.de> +Oliver Scherer <oliver.schneider@kit.edu> <git-no-reply-9879165716479413131@oli-obk.de> +Oliver Scherer <oliver.schneider@kit.edu> <git1984941651981@oli-obk.de> +Oliver Scherer <oliver.schneider@kit.edu> <github35764891676564198441@oli-obk.de> +Oliver Scherer <oliver.schneider@kit.edu> <github6541940@oli-obk.de> +Oliver Scherer <oliver.schneider@kit.edu> <oli-obk@users.noreply.github.com> +Oliver Scherer <oliver.schneider@kit.edu> <public.oliver.schneider@kit.edu> +Oliver Scherer <oliver.schneider@kit.edu> <obk8176014uqher834@olio-obk.de> +Oliver Scherer <oliver.schneider@kit.edu> Ožbolt Menegatti <ozbolt.menegatti@gmail.com> gareins <ozbolt.menegatti@gmail.com> 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> |