summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJohn Dickinson <me@not.mn>2019-03-18 17:09:31 -0700
committerJohn Dickinson <me@not.mn>2019-03-22 16:53:01 -0700
commit179fa7ccd4d6faeacc989715887b69f9422a17b2 (patch)
treee8d508ee89f6eff418a54b43890ca7e791af434d /.mailmap
parent2fa6ac344a84e30a50282ee638e19462abb926c7 (diff)
downloadswift-179fa7ccd4d6faeacc989715887b69f9422a17b2.tar.gz
authors/changelog update for 2.21.0 release2.21.0
Change-Id: Iac51a69c71491e5a8db435aae396178a6c592c73
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 08ae9e4b9..de22039db 100644
--- a/.mailmap
+++ b/.mailmap
@@ -79,7 +79,7 @@ Minwoo Bae <minwoob@us.ibm.com> Minwoo B
Jaivish Kothari <jaivish.kothari@nectechnologies.in> <janonymous.codevulture@gmail.com>
Michael Matur <michael.matur@gmail.com>
Kazuhiro Miyahara <miyahara.kazuhiro@lab.ntt.co.jp>
-Alexandra Settle <alexandra.settle@rackspace.com>
+Alexandra Settle <asettle@suse.com> <alexandra.settle@rackspace.com>
Kenichiro Matsuda <matsuda_kenichi@jp.fujitsu.com>
Atsushi Sakai <sakaia@jp.fujitsu.com>
Takashi Natsume <natsume.takashi@lab.ntt.co.jp>