Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
authorlain <lain@soykaf.club>
Tue, 5 Jan 2021 11:42:30 +0000 (12:42 +0100)
committerlain <lain@soykaf.club>
Tue, 5 Jan 2021 11:42:30 +0000 (12:42 +0100)
commitf0e6cff58365791f3bfa79117351ee2e705d1b6b
treeb803125707e627f86f941f66cc3f2810dc063c0a
parent4200a063408966b1e14e79b18c96ce59af23ec35
parentca7cf62d2aae25c3a299181baa3a8f389dfd1858
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
CHANGELOG.md