Merge branch 'insp3' into master.

This commit is contained in:
Sadie Powell 2022-07-22 16:41:53 +01:00
commit 816af8c8cf
2 changed files with 7 additions and 7 deletions

View File

@ -1,8 +1,7 @@
Since the first commit in January 2003 105 people have submitted patches,
Since the first commit in January 2003 107 people have submitted patches,
commits, and other useful contributions to InspIRCd. These people, ordered by
the number of contributions they have made, are:
* Craig Edwards <brain@inspircd.org>
* Sadie Powell <sadie@witchery.services>
* Attila Molnar <attilamolnar@hush.com>
@ -25,8 +24,8 @@ the number of contributions they have made, are:
* burlex
* jackmcbarn <jackmcbarn@inspircd.org>
* Uli Schlachter <psychon@inspircd.org>
* ChrisTX <xpipe@hotmail.de>
* B00mX0r <b00mx0r@aureus.pw>
* ChrisTX <xpipe@hotmail.de>
* fez
* Shawn Smith <ShawnSmith0828@gmail.com>
* DjSlash <djslash@djslash.org>
@ -38,15 +37,16 @@ the number of contributions they have made, are:
* Dylan Frank <b00mx0r@aureus.pw>
* Steven Van Acker <steven@singularity.be>
* Val Lorentz <progval+git@progval.net>
* Wade Cline <wadecline@hotmail.com>
* Dan Parsons <dparsons@nyip.net>
* Googolplexed <googol@googolplexed.net>
* Herman <GermanAizek@yandex.ru>
* Mantas Mikulėnas <grawity@gmail.com>
* Renegade334 <contact.caaeed4f@renegade334.me.uk>
* Sheogorath <sheogorath@shivering-isles.com>
* Wade Cline <wadecline@hotmail.com>
* typobox43
* Anatole Denis <natolumin@rezel.net>
* Andrio Celos
* Ben Harris <ben@tilde.team>
* Chin Lee <kwangchin@gmail.com>
* Christopher 'm4z' Holm <them4z@gmail.com>
@ -68,13 +68,13 @@ the number of contributions they have made, are:
* Adrien Bustany <adrien@bustany.org>
* Akinwale Ariwodola <akinwale@gmail.com>
* Alyx <alyx@malkier.net>
* Andrio Celos
* Boleslaw Tokarski <boleslaw.tokarski@tieto.com>
* Chew
* Chris Novakovic
* Christian Höltje <docwhat@gerf.org>
* Christoph Egger <christoph@debian.org>
* Christos Triantafyllidis
* Daniel De Graaf <danieldg@inspircd.org>.
* David Lamont <del6597@rit.edu>
* David Schultz <me@zpld.me>
* Dominic Hamon
@ -90,6 +90,7 @@ the number of contributions they have made, are:
* Julien Vehent <julien@linuxwall.info>
* JustArchi <JustArchi@JustArchi.net>
* Matthew Martin <phy1729@gmail.com>
* Nicole Kleinhoff <ilbelkyr@shalture.org>
* Pierre Carrier <pierre@spotify.com>
* Puck Meerburg <puck@puckipedia.com>
* R-V6

View File

@ -31,7 +31,7 @@ use make::common;
use make::console;
my %authors;
for my $author (split /\n+/, `git log --pretty='%aN <%aE>' HEAD`) {
for my $author (split /\n+/, `git log --pretty='%aN <%aE>%n%(trailers:key=Co-Authored-By,valueonly)' HEAD`) {
$author = $1 if $author =~ /^(.+) <(?:unknown\@email.invalid|\S+\@users.noreply.github.com)>$/;
next if $author =~ /\[bot\]$/;
@ -45,7 +45,6 @@ say $fh <<"EOH";
Since the first commit in January 2003 ${\scalar %authors} people have submitted patches,
commits, and other useful contributions to InspIRCd. These people, ordered by
the number of contributions they have made, are:
EOH
for my $author (sort { $authors{$b} <=> $authors{$a} or $a cmp $b } keys %authors) {