Merge branch 'mergeback/2.3.0' into 'develop'
authorlain <lain@soykaf.club>
Wed, 3 Mar 2021 15:07:50 +0000 (15:07 +0000)
committerlain <lain@soykaf.club>
Wed, 3 Mar 2021 15:07:50 +0000 (15:07 +0000)
Mergeback/2.3.0

See merge request pleroma/pleroma!3360


Trivial merge