From: kaniini <ariadne@dereferenced.org>
Date: Mon, 30 Sep 2019 16:40:46 +0000 (+0000)
Subject: Merge branch 'chore/maint-1.1-1.1.0-rc1' into 'maint/1.1'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=70d18a278c76e5681543a21150884f9e5dfcd097;p=akkoma

Merge branch 'chore/maint-1.1-1.1.0-rc1' into 'maint/1.1'

Pleroma 1.0.90 (aka 1.1 RC1).

See merge request pleroma/pleroma!1754
---

70d18a278c76e5681543a21150884f9e5dfcd097