From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 5 Oct 2020 20:24:35 +0000 (+0000)
Subject: Merge branch 'next'
X-Git-Tag: v2.25-core151~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e4126c33b8bb031a3358333d10cb03f8f377c9b;p=ipfire-2.x.git

Merge branch 'next'
---

5e4126c33b8bb031a3358333d10cb03f8f377c9b
diff --cc html/cgi-bin/credits.cgi
index 02dfb889ed,fe838157fb..cc0b958ce5
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@@ -82,9 -82,10 +82,9 @@@ Stephan Feddersen
  Timo Eissler,
  Jan Lentfer,
  Marcus Scholz,
 -Stéphane Pautrel,
  Ersan Yildirim,
+ Jörn-Ingo Weigert,
 -Adolf Belka,
 +Stéphane Pautrel,
- Joern-Ingo Weigert,
  Alexander Koch,
  Wolfgang Apolinarski,
  Alfred Haas,