From 6696b6fca647cb1fe1ce74e8127090aa61482cab Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 13 Apr 2024 13:41:39 +0200
Subject: Merging upstream version 1.2.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 edbf393..bd13a63 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,5 +3,6 @@ Diana Flach <crunsher@bamberg.ccc.de> <Crunsher@users.noreply.github.com>
 Diana Flach <crunsher@bamberg.ccc.de> <jean-marcel.flach@icinga.com>
 Diana Flach <crunsher@bamberg.ccc.de> <jean.flach@icinga.com>
 Henrik Triem <henrik.triem@icinga.com> <43344334+htriem@users.noreply.github.com>
+Julian Brost <julian.brost@icinga.com> <julian.brost@gmail.com>
 <henrik.triem@icinga.com> <henrik.triem@netways.de>
 <yonas.habteab@icinga.com> <yonas.habteab@netways.de>
-- 
cgit v1.2.3