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)
commit222c238e7b807853dc02a79e00273b5f6b70eb4b
tree81942e71bc994ecb892c7dd36766b4f65e60954a
parenta553ed542774891b6b0b7a57372a2c0300bbe2ba
parent6b7cd7d8504d47eef4efdf34fbd1d0eb32bb8375
Merge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1'

Backport !1777 to 1.1

See merge request pleroma/pleroma!1786