Merge branch 'patch-2' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sat, 3 Aug 2019 18:55:09 +0000 (18:55 +0000)
committerkaniini <ariadne@dereferenced.org>
Sat, 3 Aug 2019 18:55:09 +0000 (18:55 +0000)
Add preferredUsername to service actors so Mastodon can resolve them

See merge request pleroma/pleroma!1526


Trivial merge