Rollup merge of #97189 - pvdrz:patch-1, r=Mark-Simulacrum

GuillaumeGomez · web-flow · commit 474e12b201c9 · 2022-05-20T14:03:05.000+02:00
Update .mailmap
diff --git a/.mailmap b/.mailmap
@@ -105,10 +105,13 @@ Chris Vittal <christopher.vittal@gmail.com> Christopher Vittal <christopher.vitt
 Christiaan Dirkx <christiaan@dirkx.email> <christiaan@dirkx.com>
 Christiaan Dirkx <christiaan@dirkx.email> CDirkx <christiaan@dirkx.com>
 Christiaan Dirkx <christiaan@dirkx.email> CDirkx <christiaan@dirkx.email>
-Christian Poveda <git@christianpoveda.xyz> <christianpoveda@protonmail.com>
-Christian Poveda <git@christianpoveda.xyz> <cn.poveda.ruiz@gmail.com>
-Christian Poveda <git@christianpoveda.xyz> <z1mvader@protonmail.com>
-Christian Poveda <git@christianpoveda.xyz> <cpovedar@fnal.gov>
+Christian Poveda <git@pvdrz.com> <christianpoveda@protonmail.com>
+Christian Poveda <git@pvdrz.com> <cn.poveda.ruiz@gmail.com>
+Christian Poveda <git@pvdrz.com> <z1mvader@protonmail.com>
+Christian Poveda <git@pvdrz.com> <cpovedar@fnal.gov>
+Christian Poveda <git@pvdrz.com> <git@christianpoveda.xyz>
+Christian Poveda <git@pvdrz.com> <31802960+christianpoveda@users.noreply.github.com>
+Christian Poveda <git@pvdrz.com> <christianpoveda@uhura.edef.eu>
 Christian Vallentin <vallentinsource@gmail.com>
 Christoffer Buchholz <chris@chrisbuchholz.me>
 Christopher Durham <cad97@cad97.com>

-Original file line number
+Diff line change
 Christiaan Dirkx <[email protected]> <[email protected]>
 Christiaan Dirkx <[email protected]> CDirkx <[email protected]>
 Christiaan Dirkx <[email protected]> CDirkx <[email protected]>
 -Christian Poveda <[email protected]> <[email protected]>
 -Christian Poveda <[email protected]> <[email protected]>
 -Christian Poveda <[email protected]> <[email protected]>
 -Christian Poveda <[email protected]> <[email protected]>
 +Christian Poveda <[email protected]> <[email protected]>
 +Christian Poveda <[email protected]> <[email protected]>
 +Christian Poveda <[email protected]> <[email protected]>
 +Christian Poveda <[email protected]> <[email protected]>
 +Christian Poveda <[email protected]> <[email protected]>
 +Christian Poveda <[email protected]> <[email protected]>
 +Christian Poveda <[email protected]> <[email protected]>
 Christian Vallentin <[email protected]>
 Christoffer Buchholz <[email protected]>
 Christopher Durham <[email protected]>