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)
commit6c491b2006ef2f279e6ffbb4ac007b7740c6d50d
tree01455057e3a75c7897cb7136890158669bf35371
parent4016341a77337e3b71295d27808eebc05152b086
parent347a1823fdce8271acb7adac9595f5c8754b8f5c
Merge branch 'chore/mailmap' into 'develop'

add mailmap [ci skip]

See merge request pleroma/pleroma!1399