From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 5 Jun 2019 11:46:37 +0000 (+0100)
Subject: Update contributors
X-Git-Tag: v2.23-core133~16
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=171512b7a76f61669b61d234965570e40f585fee

Update contributors

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

diff --git a/.mailmap b/.mailmap
index f920b448fa..08653c701e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -33,3 +33,4 @@ Rene Zingel	<linuxadmin@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Ronald Wiesinger	<rowie@ipfire.org>
 Stéphane Pautrel	<steph78630@gmail.com>
 Erik Kapfer		<ummeegge@ipfire.org>
+Stephan Feddersen	<sfeddersen@ipfire.org>
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 7119a46281..6ce9542b28 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -92,11 +92,11 @@ Sascha Kilian,
 Ronald Wiesinger,
 Stephan Feddersen,
 Stéphane Pautrel,
+Florian Bührle,
+Bernhard Bitsch,
 Justin Luth,
 Michael Eitelwein,
-Bernhard Bitsch,
 Dominik Hassler,
-Florian Bührle,
 Larsen,
 Gabriel Rolland,
 Anton D. Seliverstov,
@@ -107,6 +107,7 @@ Jakub Ratajczak,
 Jorrit de Jonge,
 Jörn-Ingo Weigert,
 Przemek Zdroik,
+Tim FitzGeorge,
 Alexander Rudolf Gruber,
 Andrew Bellows,
 Axel Gembe,
@@ -134,7 +135,6 @@ Robert Möker,
 Stefan Ernst,
 Stefan Ferstl,
 Thomas Ebert,
-Tim FitzGeorge,
 Timmothy Wilson,
 Umberto Parma
 	<!-- END -->