From: rinpatch <rinpatch@sdf.org>
Date: Mon, 14 Oct 2019 18:21:49 +0000 (+0000)
Subject: Merge branch 'final-release-prep' into 'maint/1.1'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=832d892c2c77c836aa46f47f9610b5718c7656b3;p=akkoma

Merge branch 'final-release-prep' into 'maint/1.1'

Final 1.1 release preparations

See merge request pleroma/pleroma!1843
---

832d892c2c77c836aa46f47f9610b5718c7656b3