diff options
| author | kaniini <nenolod@gmail.com> | 2019-07-11 09:03:17 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-07-11 09:03:17 +0000 |
| commit | 6c491b2006ef2f279e6ffbb4ac007b7740c6d50d (patch) | |
| tree | 01455057e3a75c7897cb7136890158669bf35371 | |
| parent | 4016341a77337e3b71295d27808eebc05152b086 (diff) | |
| parent | 347a1823fdce8271acb7adac9595f5c8754b8f5c (diff) | |
| download | pleroma-6c491b2006ef2f279e6ffbb4ac007b7740c6d50d.tar.gz | |
Merge branch 'chore/mailmap' into 'develop'
add mailmap [ci skip]
See merge request pleroma/pleroma!1399
| -rw-r--r-- | .mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
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> |