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

Merge branch 'release/2.1.2' into 'stable'

Release/2.1.2

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

a0f5e8b27edbe2224d9c2c3997ad5b8ea484244b