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)
commit86fffe9c275632d0ec0148df11e74c38cbdc7233
tree5773ba32d64564fed70162f0b30c8fa7b12f3443
parent4ae0a6652f2aaa04c8f96a7bfb4ffe35c8bfdeaf
parent1fce56c7dffb84917b6943cc5919ed76e06932a5
Merge branch 'patch-2' into 'develop'

Add preferredUsername to service actors so Mastodon can resolve them

See merge request pleroma/pleroma!1526