summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorViktor Szakats <commit@vszakats.net>2018-09-22 07:58:05 +0000
committerViktor Szakats <commit@vszakats.net>2018-09-22 07:58:32 +0000
commitf078361c0e2539689df9962f35ab22f8ea25afe9 (patch)
tree6d45965001209ac84124967d64dd5339a26a1c44 /.mailmap
parentdee1700ce6ed2588f6db61fc9ca52ac8bccc71f8 (diff)
downloadcurl-f078361c0e2539689df9962f35ab22f8ea25afe9.tar.gz
URL and mailmap updates, remove an obsolete directory [ci skip]
Closes https://github.com/curl/curl/pull/3031
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap5
1 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 8acbf4901..cc86d0032 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,7 +5,8 @@ Alessandro Ghedini <alessandro@ghedini.me> <alessandro@cloudflare.com>
Alessandro Ghedini <alessandro@ghedini.me> <al3xbio@gmail.com>
Björn Stenberg <bjorn@haxx.se>
Björn Stenberg <bjorn@haxx.se> <bjst@bjorn>
-Viktor Szakats <vszakats@users.noreply.github.com>
+Viktor Szakats <commit@vszakats.net>
+Viktor Szakats <commit@vszakats.net> <vszakats@users.noreply.github.com>
Daniel Gustafsson <daniel@yesql.se> <dgustafsson@pivotal.io>
Daniel Gustafsson <daniel@yesql.se> <daniel@hobbit.se>
Linus Nielsen <linus@haxx.se>
@@ -19,7 +20,7 @@ Patrick Monnerat <patrick@monnerat.net> <Patrick.Monnerat@datasphere.ch>
Patrick Monnerat <patrick@monnerat.net> <patrick.monnerat@dh.com>
Patrick Monnerat <patrick@monnerat.net> <pm@datasphere.ch>
Patrick Monnerat <patrick@monnerat.net> <monnerat@users.noreply.github.com>
-Nick Zitzmann <nickzman@gmail.com><nick@chronosnet.com>
+Nick Zitzmann <nickzman@gmail.com> <nick@chronosnet.com>
Peter Wu <peter@lekensteyn.nl> <peter_at_lekensteyn.nl>
David Woodhouse <David.Woodhouse@intel.com> <dwmw2@infradead.org>
Marcel Raad <Marcel.Raad@teamviewer.com> <raad@teamviewer.com>