Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1
authorlain <lain@soykaf.club>
Wed, 23 Dec 2020 10:40:34 +0000 (11:40 +0100)
committerlain <lain@soykaf.club>
Wed, 23 Dec 2020 10:40:34 +0000 (11:40 +0100)
commit5ada38499b8f906306796b9771361571fdf03073
treee3c9386d9e2b338754fcbe85a09af7f624c6c43e
parent322463e1bdc9da76a93918fd9168a0e8fbd46802
parent463eec992a43c74682aca192cebff4a293d4a358
Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1
CHANGELOG.md