X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/62c87179ef8ed0fd334274806be80d91623e1db2..8f0c3422e75189b7f39a7555ded278ab6027707b:/.mailmap

diff --git a/.mailmap b/.mailmap
index 3b5491c9..2865bf9e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,9 +1,14 @@
 Aaron Sethman <androsyn@ratbox.org> androsyn <devnull@localhost>
 Alexander Færøy <ahf@0x90.dk> Alexander F?r?y <ahf@0x90.dk>
+Ariadne Conill <ariadne@dereferenced.org> <nenolod@atheme.org>
+Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>
+Ariadne Conill <ariadne@dereferenced.org> nenolod <devnull@localhost>
 Brett Greenham <taros@shadowircd.net> B.Greenham <taros@shadowircd.net>
 Chris Mills <chris@chrisam.net> TheChrisAM <chris@chrisam.net>
 Chris Mills <chris@chrisam.net> freenode!ChrisAM <chris@chrisam.net>
-Elizabeth Jennifer Myers <elizabeth@sporksmoo.net> <elizabeth@sporksirc.net>
+Elizabeth Myers <elizabeth@interlinked.me> <elizabeth@sporksirc.net>
+Elizabeth Myers <elizabeth@interlinked.me> <elizabeth@sporksmoo.net>
+Elizabeth Myers <elizabeth@interlinked.me> <spaz@whotookspaz.org>
 Elly Fong-Jones <elly@leptoquark.net> Elly <elly@leptoquark.net>
 Jilles Tjoelker <jilles@stack.nl> jilles <devnull@localhost>
 Nathan Phillip Brink <binki@gentoo.org> <ohnobinki@ohnopublishing.net>
@@ -13,5 +18,5 @@ Valeriy Yatsko <dwr@shadowircd.net> <darkwire@darkwire.ru>
 Valeriy Yatsko <dwr@shadowircd.net> <darkwire@ircd-charybdis.ru>
 Valeriy Yatsko <dwr@shadowircd.net> <darkwire@sellcenter.ru>
 Valeriy Yatsko <dwr@shadowircd.net> <dwr@it-penza.org>
-William Pitcock <nenolod@dereferenced.org> <nenolod@atheme.org>
-William Pitcock <nenolod@dereferenced.org> nenolod <devnull@localhost>
+Christine Dodrill <shadow.h511@gmail.com> <quora@lavabit.com>
+Christine Dodrill <shadow.h511@gmail.com> <quorawings@gmail.com>