pleroma

commit: 6c491b2006ef2f279e6ffbb4ac007b7740c6d50d
parent: 4016341a77337e3b71295d27808eebc05152b086
Author: kaniini <nenolod@gmail.com>
Date:   Thu, 11 Jul 2019 09:03:17 +0000

Merge branch 'chore/mailmap' into 'develop'

add mailmap [ci skip]

See merge request pleroma/pleroma!1399
Diffstat:
A
.mailmap
2
++

1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,2 @@
+Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>
+Ariadne Conill <ariadne@dereferenced.org> <nenolod@gmail.com>