From: rinpatch <rinpatch@sdf.org>
Date: Thu, 17 Sep 2020 19:42:42 +0000 (+0000)
Subject: Merge branch 'stable-sync/2.1.2' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=49584a9928f02b461a0356332440084473ea6b69;p=akkoma

Merge branch 'stable-sync/2.1.2' into 'develop'

Sync develop with 2.1.2

Closes #2133, #2131, and #2130

See merge request pleroma/pleroma!3007
---

49584a9928f02b461a0356332440084473ea6b69