summary refs log tree commit diff
path: root/.mailmap
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2020-05-10 00:16:11 +0200
committerAlexander Barton <alex@barton.de>2020-05-10 00:16:11 +0200
commite8608075006ba3aef2b3bbe26405fb342870e24f (patch)
tree73aa6df943f52d8ae058bc15407f73e98011105e /.mailmap
parente889de9d92adf09f9c77df03d8a85736bc15d380 (diff)
downloadngircd-e8608075006ba3aef2b3bbe26405fb342870e24f.tar.gz
ngircd-e8608075006ba3aef2b3bbe26405fb342870e24f.zip
Add missing authors to AUTHORS, tweak ".mailmap" file
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap6
1 files changed, 6 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 7dfa21ba..860a2374 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,8 @@ Alexander Barton <alex@barton.de> <alex@kfreebsd.barton.de>
 
 Ali Shemiran <ashemira@ucsd.edu>
 
+Christoph Biedl <ngircd.anoy@manchmal.in-ulm.de> <debian.axhn@manchmal.in-ulm.de>
+
 Dana Dahlstrom <dana+ngIRCd@cs.ucsd.edu> <dana@cs.ucsd.edu>
 Dana Dahlstrom <dana+ngIRCd@cs.ucsd.edu> <dana+70@cs.ucsd.edu>
 
@@ -14,3 +16,7 @@ DNS <dns@rbose.org>
 Götz Hoffart <goetz@hoffart.de>
 
 LucentW <lucent@zebes.info> <LucentW@users.noreply.github.com>
+
+Michi <michi+ngircd@dataswamp.org>
+
+Sam James <sam@cmpct.info> <11667869+thesamesam@users.noreply.github.com>