From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 30 Sep 2020 10:30:14 +0000 (+0000)
Subject: Update contributors
X-Git-Tag: v2.25-core151~8^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e870fcb76847939304402e86919c1de757c50dd;p=ipfire-2.x.git

Update contributors

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/.mailmap b/.mailmap
index 08653c701e..b8f710ddf9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,7 @@ Dirk Wagner		<root@etch-server.wagner-budenheim.de>
 Heiner Schmeling	<casemaster@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Jan Paul Tücking	<earl@ipfire.org>
 Jörn-Ingo Weigert	<jiweigert@ipfire.org>
+Jörn-Ingo Weigert	<jiweigert@gmail.com>
 Michael Tremer	<delaco@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Michael Tremer	<ipfire@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Michael Tremer	<michael.tremer.info>
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 0ea6d2e5f0..fe838157fb 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -67,8 +67,8 @@ Christian Schmidt,
 Alexander Marx,
 Matthias Fischer,
 Peter Müller,
-Jan Paul Tücking,
 Erik Kapfer,
+Jan Paul Tücking,
 Jonatan Schlag,
 Dirk Wagner,
 Marcel Lorenz,
@@ -82,12 +82,12 @@ Stephan Feddersen,
 Timo Eissler,
 Jan Lentfer,
 Marcus Scholz,
-Ersan Yildirim,
 Stéphane Pautrel,
-Joern-Ingo Weigert,
+Ersan Yildirim,
+Jörn-Ingo Weigert,
+Adolf Belka,
 Alexander Koch,
 Wolfgang Apolinarski,
-Adolf Belka,
 Alfred Haas,
 Lars Schuhmacher,
 Rene Zingel,
@@ -109,7 +109,6 @@ David Kleuker,
 Hans Horsten,
 Jakub Ratajczak,
 Jorrit de Jonge,
-Jörn-Ingo Weigert,
 Przemek Zdroik,
 Ramax Lo,
 Alexander Rudolf Gruber,