From: rinpatch <rinpatch@sdf.org>
Date: Fri, 18 Oct 2019 21:44:14 +0000 (+0000)
Subject: Merge branch 'release/1.1.2' into 'stable'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=9b26d1608f5ddd64a146dec3c41b029c1b7a4198;hp=59d447d5558ee88fa1ad479b87d14b7276547fb8;p=akkoma

Merge branch 'release/1.1.2' into 'stable'

1.1.2 Release

See merge request pleroma/pleroma!1863
---