diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-12 18:08:27 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-12 18:08:27 +0300 |
| commit | eae991b06a22bf7fc3eef7a0d5b409c931c1f6cb (patch) | |
| tree | 77cd19ea54b8efa69e45b2d37876e7d5084cf38e /.mailmap | |
| parent | 371d39e160efa51f2fe608e1788f6b11b89d9839 (diff) | |
| parent | db75288b71e7531f8e5033f56fc0b9a7d1d8efb3 (diff) | |
| download | pleroma-eae991b06a22bf7fc3eef7a0d5b409c931c1f6cb.tar.gz pleroma-eae991b06a22bf7fc3eef7a0d5b409c931c1f6cb.zip | |
merge develop
Diffstat (limited to '.mailmap')
| -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> |