From: rinpatch <rinpatch@sdf.org>
Date: Tue, 8 Sep 2020 17:21:12 +0000 (+0000)
Subject: Merge branch 'release/2.1.1' into 'stable'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=425324aae3d4534bc045466a1cc15653ddfa27d2;hp=073f5490ece616fd9602382c1be1347457cbbe79;p=akkoma

Merge branch 'release/2.1.1' into 'stable'

2.1.1 release

See merge request pleroma/secteam/pleroma!13
---