From: lain <lain@soykaf.club>
Date: Tue, 5 Jan 2021 12:31:33 +0000 (+0000)
Subject: Merge branch '1526-account-aliases' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7a03b112f2ae0acbb546975a3cb57f63ab69708d;p=akkoma

Merge branch '1526-account-aliases' into 'develop'

Resolve "account move from mastodon to pleroma"

Closes #1526

See merge request pleroma/pleroma!3233
---

7a03b112f2ae0acbb546975a3cb57f63ab69708d