summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 11:41:41 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 11:41:41 +0000
commit5d920465245906e2250c288c2b1ffea608a37539 (patch)
tree8d52f82e5d4a1717f136c7e5f6c389464c403e79 /.mailmap
parentReleasing progress-linux version 1.1.1-2~progress7.99u1. (diff)
downloadicingadb-5d920465245906e2250c288c2b1ffea608a37539.tar.xz
icingadb-5d920465245906e2250c288c2b1ffea608a37539.zip
Merging upstream version 1.2.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
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>