about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Scherer <github35764891676564198441@oli-obk.de>2019-08-15 18:20:35 +0200
committerOliver Scherer <github35764891676564198441@oli-obk.de>2019-08-30 00:30:50 +0200
commitc6e7f039aabe3338c400d197a689c94bde425ba6 (patch)
treeb4162c6f72a9c3ac09089592f82a5d4f265e67db
parent1cdcea920e56a5d0587307a4c9cf8fff5c77c4bc (diff)
downloadrust-c6e7f039aabe3338c400d197a689c94bde425ba6.tar.gz
rust-c6e7f039aabe3338c400d197a689c94bde425ba6.zip
Merge oli-obk mail addresses
-rw-r--r--.mailmap19
1 files changed, 13 insertions, 6 deletions
diff --git a/.mailmap b/.mailmap
index c5ecfb54fca..91b2e762d8e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -181,12 +181,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>