From: lain <lain@soykaf.club>
Date: Wed, 3 Mar 2021 15:07:50 +0000 (+0000)
Subject: Merge branch 'mergeback/2.3.0' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=13aa98d6899ba1e4a37fa1fd3ddb1ac35ea6e136;p=akkoma

Merge branch 'mergeback/2.3.0' into 'develop'

Mergeback/2.3.0

See merge request pleroma/pleroma!3360
---

13aa98d6899ba1e4a37fa1fd3ddb1ac35ea6e136