aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThéo Zimmermann2019-04-10 17:52:04 +0200
committerThéo Zimmermann2019-04-10 17:52:04 +0200
commitddf6dffe7d9afe635d32c41336345812f7c71139 (patch)
tree50b87d672b35e40ba8692c2e11bc6694b6b51187
parentb177e7b9991e81ec3c9c145f04ca3a896f756fd9 (diff)
parente0c492102b5a625f2122faa9912f4d19b950cd22 (diff)
Merge PR #9943: [mailmap] Tweak Emilio's entries.
Reviewed-by: Zimmi48
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index e9e4d11641..c0ed2e426a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -45,7 +45,8 @@ Julien Forest <julien.forest@ensiie.fr> forest <jforest@mourvedre.ens
Julien Forest <julien.forest@ensiie.fr> jforest <jforest@thune>
Julien Forest <julien.forest@ensiie.fr> jforest <jforest@daneel.lan.home>
Julien Forest <julien.forest@ensiie.fr> Julien Forest <forest@ensiie.fr>
-Emilio Jesus Gallego Arias <e+git@x80.org> Emilio Jesús Gallego Arias <e+git@x80.org>
+Emilio Jesús Gallego Arias <e@x80.org> Emilio Jesus Gallego Arias <e+git@x80.org>
+Emilio Jesús Gallego Arias <e@x80.org> Emilio Jesús Gallego Arias <e+git@x80.org>
Gaëtan Gilbert <gaetan.gilbert@skyskimmer.net> <gaetan.gilbert@ens-lyon.fr>
Gaëtan Gilbert <gaetan.gilbert@skyskimmer.net> <gaetan.gilbert@skyskimmer.net>
Stéphane Glondu <steph@glondu.net> glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7>