From a90a5cba08fdf6c0ceb95101c275108a152a3aed Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 12 Jun 2024 07:35:37 +0200
Subject: Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index c43b963245..80fb81eaeb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +1,3 @@
 Andreas Tolfsen <ato@sny.no> <ato@mozilla.com>
 Nika Layzell <nika@thelayzells.com> <michael@thelayzells.com>
+Alex Thayer <dothayer@mozilla.com>
-- 
cgit v1.2.3