From: rinpatch <rinpatch@sdf.org>
Date: Tue, 17 Nov 2020 12:40:42 +0000 (+0000)
Subject: Merge branch 'sync-stable/2.2.0' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=6c3273892f195e4ac4cf56836e4ef0d11a149434;hp=6c3273892f195e4ac4cf56836e4ef0d11a149434;p=akkoma

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

Import stable commits into develop after releasing 2.2.0

Closes #2275, #1516, #2257, #2242, #1668, and #2236

See merge request pleroma/pleroma!3151
---