From: lain <lain@soykaf.club>
Date: Fri, 28 Aug 2020 12:17:19 +0000 (+0000)
Subject: Merge branch 'release/2.1.0' into 'stable'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=73dd5bdb7dcdf804bdbabcf632671d4de5042ebc;p=akkoma

Merge branch 'release/2.1.0' into 'stable'

Release/2.1.0

See merge request pleroma/pleroma!2927
---

73dd5bdb7dcdf804bdbabcf632671d4de5042ebc