X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=.mailmap;h=35f1c9c76b5b71c2588f4db02481585cc3d50901;hb=55a0a6ab66739fae65d123fadff1a31d96999c16;hp=21e89a1842bee81521046c283590c3233fe13c7c;hpb=d1513c8c6064414faaa401592d463e7149a772ba;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.mailmap b/.mailmap
index 21e89a184..35f1c9c76 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,5 +1,7 @@
 Adam <Adam@anope.org>                        Adam <adam@inspircd.org>
 Adam <Adam@anope.org>                        Adam <adam@sigterm.info>
+Ariadne Conill <ariadne@dereferenced.org>    nenolod <nenolod@e03df62e-2008-0410-955e-edbf42e46eb7>
+Ariadne Conill <ariadne@dereferenced.org>    William Pitcock <nenolod@dereferenced.org>
 Attila Molnar <attilamolnar@hush.com>        Attila Molnar <am63770@gmail.com>
 Attila Molnar <attilamolnar@hush.com>        attilamolnar <am63770@gmail.com>
 Attila Molnar <attilamolnar@hush.com>        attilamolnar <attilamolnar@hush.com>
@@ -27,6 +29,7 @@ John Brooks <special@inspircd.org>           special <special@e03df62e-2008-0410
 Justin Crawford <Justasic@Gmail.com>         Justasic <Justasic@gmail.com>
 linuxdaemon <linuxdaemon.irc@gmail.com>      linuxdaemon <linuxdaemon@snoonet.org>
 linuxdaemon <linuxdaemon.irc@gmail.com>      linuxdaemon <linuxdaemon@users.noreply.github.com>
+Matt Schatz <genius3000@g3k.solutions>       genius3000 <genius3000@g3k.solutions>
 Matt Smith <dz@inspircd.org>                 dz <dz@e03df62e-2008-0410-955e-edbf42e46eb7>
 md_5 <git@md-5.net>                          md-5 <md-5@users.noreply.github.com>
 Oliver Lupton <om@inspircd.org>              om <om@e03df62e-2008-0410-955e-edbf42e46eb7>
@@ -36,9 +39,9 @@ Robby <robby@chatbelgie.be>                  Robby- <robby@chat.be>
 Robby <robby@chatbelgie.be>                  Robby- <robbyke@gmail.com>
 Robin Burchell <robin+git@viroteck.net>      Robin Burchell <viroteck@viroteck.net>
 Robin Burchell <robin+git@viroteck.net>      w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>
+Sadie Powell <sadie@witchery.services>       Peter Powell <petpow@saberuk.com>
 Thomas Stagner <aquanight@inspircd.org>      aquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7>
 Uli Schlachter <psychon@inspircd.org>        psychon <psychon@e03df62e-2008-0410-955e-edbf42e46eb7>
-William Pitcock <nenolod@dereferenced.org>   nenolod <nenolod@e03df62e-2008-0410-955e-edbf42e46eb7>
 
 # The identities of the following people could not be verified:
 #