summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2021-01-28 11:54:41 +0000
committerSadie Powell <sadie@witchery.services>2021-01-28 11:58:15 +0000
commitad1ad11067ab089710305c030b00e966f3f10d17 (patch)
tree1bc7d4a98422424f1732b9231830382cd25bb753 /.mailmap
parent0ea4e0cb914a118a399242f24b80fceffdb180c5 (diff)
Update the mailmap.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 5d604aa36..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>
@@ -40,7 +42,6 @@ Robin Burchell <robin+git@viroteck.net> w00t <w00t@e03df62e-2008-0410-955e-
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:
#