From 841a4e35ea20d88053d574abb1679fbbb6486fd5 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <git@maxdeviant.com>
Date: Sat, 17 May 2025 14:34:42 +0200
Subject: [PATCH] Update `.mailmap` (#30874)

This PR updates the `.mailmap` file to merge some more commit authors.

Release Notes:

- N/A
---
 .mailmap | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index 43f4bb497f..db4632d6ca 100644
--- a/.mailmap
+++ b/.mailmap
@@ -19,6 +19,8 @@ amtoaer <amtoaer@gmail.com>
 amtoaer <amtoaer@gmail.com> <amtoaer@outlook.com>
 Andrei Zvonimir Crnković <andrei@0x7f.dev>
 Andrei Zvonimir Crnković <andrei@0x7f.dev> <andreicek@0x7f.dev>
+Angelk90 <angelo.k90@hotmail.it>
+Angelk90 <angelo.k90@hotmail.it> <20476002+Angelk90@users.noreply.github.com>
 Antonio Scandurra <me@as-cii.com>
 Antonio Scandurra <me@as-cii.com> <antonio@zed.dev>
 Ben Kunkle <ben@zed.dev>
@@ -38,6 +40,8 @@ Dairon Medina <dairon.medina@gmail.com>
 Danilo Leal <danilo@zed.dev>
 Danilo Leal <danilo@zed.dev> <67129314+danilo-leal@users.noreply.github.com>
 Edwin Aronsson <75266237+4teapo@users.noreply.github.com>
+Elvis Pranskevichus <elvis@geldata.com>
+Elvis Pranskevichus <elvis@geldata.com> <elvis@magic.io>
 Evren Sen <nervenes@icloud.com>
 Evren Sen <nervenes@icloud.com> <146845123+evrensen467@users.noreply.github.com>
 Evren Sen <nervenes@icloud.com> <146845123+evrsen@users.noreply.github.com>
@@ -69,6 +73,8 @@ Lilith Iris <itslirissama@gmail.com> <83819417+Irilith@users.noreply.github.com>
 LoganDark <contact@logandark.mozmail.com>
 LoganDark <contact@logandark.mozmail.com> <git@logandark.mozmail.com>
 LoganDark <contact@logandark.mozmail.com> <github@logandark.mozmail.com>
+Marko Kungla <marko.kungla@gmail.com>
+Marko Kungla <marko.kungla@gmail.com> <marko@mkungla.dev>
 Marshall Bowers <git@maxdeviant.com>
 Marshall Bowers <git@maxdeviant.com> <elliott.codes@gmail.com>
 Marshall Bowers <git@maxdeviant.com> <marshall@zed.dev>
@@ -84,6 +90,7 @@ Michael Sloan <michael@zed.dev> <mgsloan@google.com>
 Mikayla Maki <mikayla@zed.dev>
 Mikayla Maki <mikayla@zed.dev> <mikayla.c.maki@gmail.com>
 Mikayla Maki <mikayla@zed.dev> <mikayla.c.maki@icloud.com>
+Morgan Krey <morgan@zed.dev>
 Muhammad Talal Anwar <mail@talal.io>
 Muhammad Talal Anwar <mail@talal.io> <talalanwar@outlook.com>
 Nate Butler <iamnbutler@gmail.com>
@@ -116,11 +123,18 @@ Shish <webmaster@shishnet.org>
 Shish <webmaster@shishnet.org> <shish@shishnet.org>
 Smit Barmase <0xtimsb@gmail.com>
 Smit Barmase <0xtimsb@gmail.com> <smit@zed.dev>
+Thomas <github.thomaub@gmail.com>
+Thomas <github.thomaub@gmail.com> <thomas.aubry94@gmail.com>
+Thomas <github.thomaub@gmail.com> <thomas.aubry@paylead.fr>
+Thomas Heartman <thomasheartman+github@gmail.com>
+Thomas Heartman <thomasheartman+github@gmail.com> <thomas@getunleash.io>
+Thomas Mickley-Doyle <tmickleydoyle@gmail.com>
+Thomas Mickley-Doyle <tmickleydoyle@gmail.com> <thomas@zed.dev>
 Thorben Kröger <dev@thorben.net>
 Thorben Kröger <dev@thorben.net> <thorben.kroeger@hexagon.com>
-Thorsten Ball <thorsten@zed.dev>
-Thorsten Ball <thorsten@zed.dev> <me@thorstenball.com>
-Thorsten Ball <thorsten@zed.dev> <mrnugget@gmail.com>
+Thorsten Ball <mrnugget@gmail.com>
+Thorsten Ball <mrnugget@gmail.com> <me@thorstenball.com>
+Thorsten Ball <mrnugget@gmail.com> <thorsten@zed.dev>
 Tristan Hume <tris.hume@gmail.com>
 Tristan Hume <tris.hume@gmail.com> <tristan@anthropic.com>
 Uladzislau Kaminski <i@uladkaminski.com>