Merge branch 'release/2.2.1' into 'stable'
authorlain <lain@soykaf.club>
Wed, 23 Dec 2020 13:35:41 +0000 (13:35 +0000)
committerlain <lain@soykaf.club>
Wed, 23 Dec 2020 13:35:41 +0000 (13:35 +0000)
commitf64237927c05173e4f29dbbd2a563f123690da7e
tree9b04b38c735ba732066dcaf0323aa53c1da90622
parent15550f7c4bf75401d0f18add0f847f640acc6627
parent843d2074fe79637016579c27062889a7e5371b7a
Merge branch 'release/2.2.1' into 'stable'

Release/2.2.1

See merge request pleroma/pleroma!3214