Merge branch 'chore/mailmap' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 11 Jul 2019 09:03:17 +0000 (09:03 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 11 Jul 2019 09:03:17 +0000 (09:03 +0000)
add mailmap [ci skip]

See merge request pleroma/pleroma!1399


Trivial merge