Merge branch 'trunk' into py-support-ipv6-only-systems

cgoldberg · web-flow · commit d27dd25d973e · 2025-07-07T16:15:19.000-04:00
diff --git a/.mailmap b/.mailmap
@@ -16,7 +16,7 @@ Brandon Walderman <brwalder@microsoft.com> <bwalderman@outlook.com>
 Brian Burg <bburg@apple.com> <burg@users.noreply.github.com>
 Chethana Paniyadi  <cpaniyad@salesforce.com> <cpaniyad@cpaniyadi-wsl.internal.salesforce.com>
 Craig Nishina <craig.nishina@gmail.com> <cnishina@users.noreply.github.com>
-Corey Goldberg <cgoldberg@gmail.com> <1113081+cgoldberg@users.noreply.github.com>
+Corey Goldberg <1113081+cgoldberg@users.noreply.github.com> <cgoldberg@gmail.com>
 Dan Fabulich <dan@fabulich.com> <dan.fabulich@redfin.com>
 <dfackrell@bluehost.com> <unlearned@gmail.com>
 Daniel P. Purkhús <purkhusid@gmail.com>

-Original file line number
+Diff line change
 Brian Burg <[email protected]> <[email protected]>
 Chethana Paniyadi  <[email protected]> <[email protected]>
 Craig Nishina <[email protected]> <[email protected]>
 -Corey Goldberg <[email protected]> <[email protected]>
 +Corey Goldberg <[email protected].com> <cgoldberg@gmail.com>
 Dan Fabulich <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 Daniel P. Purkhús <[email protected]>