From: rinpatch <rinpatch@sdf.org>
Date: Sat, 9 Nov 2019 13:32:11 +0000 (+0000)
Subject: Merge branch 'release/1.1.5' into 'stable'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=182aee9fe865dde5d7271deaa3245f651918d57e;p=akkoma

Merge branch 'release/1.1.5' into 'stable'

Release/1.1.5

See merge request pleroma/pleroma!1954
---

182aee9fe865dde5d7271deaa3245f651918d57e