X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=.mailmap;fp=.mailmap;h=e4ca5f9b589d8b6a1aeb815b9a146f7222e250ad;hb=347a1823fdce8271acb7adac9595f5c8754b8f5c;hp=0000000000000000000000000000000000000000;hpb=4016341a77337e3b71295d27808eebc05152b086;p=akkoma

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..e4ca5f9b5
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>
+Ariadne Conill <ariadne@dereferenced.org> <nenolod@gmail.com>