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)
commit7a03b112f2ae0acbb546975a3cb57f63ab69708d
tree4444bcd2b26560d37e1e52ad6583d68c8d3f90f4
parentca7cf62d2aae25c3a299181baa3a8f389dfd1858
parente802b48d558ccd4a65a6da2bcc6dacb057b7fd09
Merge branch '1526-account-aliases' into 'develop'

Resolve "account move from mastodon to pleroma"

Closes #1526

See merge request pleroma/pleroma!3233