Merge pull request #35001 from kavon/main

swift-ci · web-flow · commit d5d9e48d3765 · 2020-12-08T18:35:25.000-08:00
diff --git a/.mailmap b/.mailmap
@@ -79,6 +79,7 @@ Joe Shajrawi <shajrawi@apple.com> <joeshajrawi@Joes-iMac-Pro.local>
 Johannes Weiß <johannesweiss@apple.com> <github@tux4u.de>
 John Regner <john@johnregner.com> <regnerjr@gmail.com>
 Karoy Lorentey <klorentey@apple.com> <karoly@lorentey.hu>
+Kavon Farvardin <kfarvardin@apple.com> <kavon@farvard.in>
 Keith Smiley <k@keith.so> <keithbsmiley@gmail.com>
 Kevin Ballard <kevin@sb.org> <kevin.ballard@postmates.com>
 Kevin Saldaña <ksaldana1@gmail.com>

-Original file line number
+Diff line change
 Johannes Weiß <[email protected]> <[email protected]>
 John Regner <[email protected]> <[email protected]>
 Karoy Lorentey <[email protected]> <[email protected]>
 +Kavon Farvardin <[email protected]> <[email protected]>
 Keith Smiley <[email protected]> <[email protected]>
 Kevin Ballard <[email protected]> <[email protected]>
 Kevin Saldaña <[email protected]>