Merge branch 'chore/mailmap' into 'develop'

add mailmap [ci skip]

See merge request pleroma/pleroma!1399
This commit is contained in:
kaniini 2019-07-11 09:03:17 +00:00
commit 6c491b2006

2
.mailmap Normal file
View file

@ -0,0 +1,2 @@
Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>
Ariadne Conill <ariadne@dereferenced.org> <nenolod@gmail.com>