From: rinpatch <rinpatch@sdf.org>
Date: Tue, 8 Sep 2020 17:57:02 +0000 (+0000)
Subject: Merge branch 'stable-sync/2.1.1' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7c055af567e08be7f171a2fb687926bef5920899;p=akkoma

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

Sync stable with develop after 2.1.1

Closes #2, #2047, #2095, #2116, #1987, and #2080

See merge request pleroma/pleroma!2974
---

7c055af567e08be7f171a2fb687926bef5920899