From: kaniini <ariadne@dereferenced.org>
Date: Fri, 4 Oct 2019 17:39:20 +0000 (+0000)
Subject: Merge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=222c238e7b807853dc02a79e00273b5f6b70eb4b;p=akkoma

Merge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1'

Backport !1777 to 1.1

See merge request pleroma/pleroma!1786
---

222c238e7b807853dc02a79e00273b5f6b70eb4b