Use IsCTCP in blockcolor for ignoring CTCPs.

[user/henk/code/inspircd.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 1e3ec0ae8a6a072e84aaed553940ed246bca3cc8..35f1c9c76b5b71c2588f4db02481585cc3d50901 100644 (file)
--- 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>
@@ -37,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:
 #