sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2025-01-18 00:10:06 +01:00
Code Issues Releases Wiki Activity

Merge branch 'chore/mailmap' into 'develop'

Browse Source 
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
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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>