Merge branch '1526-account-aliases' into 'develop'
authorlain <lain@soykaf.club>
Tue, 5 Jan 2021 12:31:33 +0000 (12:31 +0000)
committerlain <lain@soykaf.club>
Tue, 5 Jan 2021 12:31:33 +0000 (12:31 +0000)
Resolve "account move from mastodon to pleroma"

Closes #1526

See merge request pleroma/pleroma!3233


Trivial merge