From: kaniini <nenolod@gmail.com>
Date: Thu, 11 Jul 2019 09:03:17 +0000 (+0000)
Subject: Merge branch 'chore/mailmap' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6c491b2006ef2f279e6ffbb4ac007b7740c6d50d;p=akkoma

Merge branch 'chore/mailmap' into 'develop'

add mailmap [ci skip]

See merge request pleroma/pleroma!1399
---

6c491b2006ef2f279e6ffbb4ac007b7740c6d50d