Merge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1'
authorkaniini <ariadne@dereferenced.org>
Fri, 4 Oct 2019 17:39:20 +0000 (17:39 +0000)
committerkaniini <ariadne@dereferenced.org>
Fri, 4 Oct 2019 17:39:20 +0000 (17:39 +0000)
Backport !1777 to 1.1

See merge request pleroma/pleroma!1786


Trivial merge