[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1ee8c6732fe33525e43fbc5f4d387eec9117a035

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1ee8c6732fe33525e43fbc5f4d387eec9117a035

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 6214 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  1ee8c6732fe33525e43fbc5f4d387eec9117a035 (commit)
       via  86705346a7d2c8f00758e9195a0d74368dc38375 (commit)
       via  9bdc8f854c238fe41d580f66998b44a8e9270a58 (commit)
      from  612424542710ab75cbfb4187d98295a7cbaec719 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1ee8c6732fe33525e43fbc5f4d387eec9117a035
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Nov 27 10:24:29 2018 +0000

    Update maintainers
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 86705346a7d2c8f00758e9195a0d74368dc38375
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Nov 27 10:23:46 2018 +0000

    git: Fix spelling of some contributors with umlauts
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 9bdc8f854c238fe41d580f66998b44a8e9270a58
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Nov 27 10:20:09 2018 +0000

    credits.cgi: Remove old dev section
    
    I do not know why I forgot this. Now it is how it was intended
    in the first place.
    
    This commit removes all email addresses because people keep
    emailing me for private support. Use the forum guys!
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 .mailmap                 |  5 +++-
 html/cgi-bin/credits.cgi | 75 +++---------------------------------------------
 2 files changed, 8 insertions(+), 72 deletions(-)

Difference in files:
diff --git a/.mailmap b/.mailmap
index 8d5174989..ec5ad1987 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,8 +13,11 @@ Christian Schmidt	<maniacikarus.ipfire.org>
 Christian Schmidt	<maniacikarus(a)ipfire.org>
 Christian Schmidt	<root(a)daedalus.homeip.net>
 Christian Schmidt	<root(a)ikarus.homeip.net>
+Daniel Weismüller	<whytea(a)ipfire.org>
 Dirk Wagner		<root(a)etch-server.wagner-budenheim.de>
 Heiner Schmeling	<casemaster(a)ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
+Jan Paul Tücking	<earl(a)ipfire.org>
+Jörn-Ingo Weigert	<jiweigert(a)ipfire.org>
 Michael Tremer	<delaco(a)ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Michael Tremer	<ipfire(a)ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Michael Tremer	<michael.tremer.info>
@@ -28,4 +31,4 @@ Michael Tremer	<root(a)rowena.ipfire.org>
 Peter Pfeiffer	<root(a)VMipfire.pfeiffer-privat.de>
 Rene Zingel	<linuxadmin(a)ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
 Ronald Wiesinger	<rowie(a)ipfire.org>
-Stéphane Pautrel <steph78630(a)gmail.com>
+Stéphane Pautrel	<steph78630(a)gmail.com>
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 21b3c0881..51965d302 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -66,7 +66,7 @@ Christian Schmidt,
 Alexander Marx,
 Matthias Fischer,
 Stefan Schantl,
-Jan Paul Tuecking,
+Jan Paul Tücking,
 Jonatan Schlag,
 Erik Kapfer,
 Peter Müller,
@@ -77,8 +77,8 @@ Ben Schweikert,
 Peter Pfeiffer,
 Daniel Glanzmann,
 Heiner Schmeling,
-Timo Eissler,
 Daniel Weismüller,
+Timo Eissler,
 Jan Lentfer,
 Marcus Scholz,
 Ersan Yildirim,
@@ -90,21 +90,21 @@ Rene Zingel,
 Sascha Kilian,
 Ronald Wiesinger,
 Stephan Feddersen,
-Daniel Weismueller,
 Justin Luth,
 Michael Eitelwein,
 Bernhard Bitsch,
 Dominik Hassler,
 Larsen,
 Gabriel Rolland,
+Stéphane Pautrel,
 Anton D. Seliverstov,
 Bernhard Bittner,
 David Kleuker,
 Hans Horsten,
 Jakub Ratajczak,
 Jorrit de Jonge,
+Jörn-Ingo Weigert,
 Przemek Zdroik,
-Stéphane Pautrel,
 Alexander Rudolf Gruber,
 Andrew Bellows,
 Axel Gembe,
@@ -120,7 +120,6 @@ Heino Gutschmidt,
 Jan Behrens,
 Jochen Kauz,
 Julian McConnell,
-Jörn-Ingo Weigert,
 Kay-Michael Köhler,
 Kim Wölfel,
 Logan Schmidt,
@@ -136,72 +135,6 @@ Timmothy Wilson,
 Umberto Parma
 	<!-- END -->
 </p>
-
-<ul style="list-style: none">
-	<li>
-		Michael Tremer
-		(<a href='mailto:michael.tremer\@ipfire.org'>michael.tremer\@ipfire.org</a>)
-	</li>
-	<li>
-		Arne Fitzenreiter
-		(<a href='mailto:arne.fitzenreiter\@ipfire.org'>arne.fitzenreiter\@ipfire.org</a>)
-	</li>
-	<li>
-		Stefan Schantl
-		(<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\@ipfire.org</a>)
-	</li>
-	<li>
-		Alexander Marx
-		(<a href='mailto:alexander.marx\@ipfire.org'>alexander.marx\@ipfire.org</a>)
-	</li>
-</ul>
-
-<p>
-	<strong>Community Developers:</strong>
-</p>
-
-<ul style="list-style: none">
-	<li>
-		Christian Schmidt
-		(<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\@ipfire.org</a>)
-	</li>
-	<li>
-		Jan Paul T&uuml;cking
-		(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)
-	</li>
-	<li>
-		Heiner Schmeling
-		(<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\@ipfire.org</a>)
-	</li>
-	<li>
-		Ronald Wiesinger
-		(<a href='mailto:ronald.wiesinger\@ipfire.org'>ronald.wiesinger\@ipfire.org</a>)
-	</li>
-	<li>
-		Silvio Rechenbach
-		(<a href='mailto:silvio.rechenbach\@ipfire.org'>silvio.rechenbach\@ipfire.org</a>)
-	</li>
-	<li>
-		Dirk Wagner
-		(<a href='mailto:dirk.wagner\@ipfire.org'>dirk.wagner\@ipfire.org</a>)
-	</li>
-	<li>
-		Erik Kapfer
-		(<a href='mailto:erik.kapfer\@ipfire.org'>erik.kapfer\@ipfire.org</a>)
-	</li>
-	<li>
-		Alfred Haas
-		(<a href='mailto:alfred.haas\@ipfire.org'>alfred.haas\@ipfire.org</a>)
-	</li>
-	<li>
-		Peter Pfeiffer
-		(<a href='mailto:peter.pfeifer\@ipfire.org'>peter.pfeifer\@ipfire.org</a>)
-	</li>
-	<li>
-		Peter Sch&auml;lchli
-		(<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli\@ipfire.org</a>)
-	</li>
-</ul>
 END
 ;
 &Header::closebox();


hooks/post-receive
--
IPFire 2.x development tree