From: kaniini <ariadne@dereferenced.org>
Date: Sat, 3 Aug 2019 18:55:09 +0000 (+0000)
Subject: Merge branch 'patch-2' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=86fffe9c275632d0ec0148df11e74c38cbdc7233;p=akkoma

Merge branch 'patch-2' into 'develop'

Add preferredUsername to service actors so Mastodon can resolve them

See merge request pleroma/pleroma!1526
---

86fffe9c275632d0ec0148df11e74c38cbdc7233