Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'
authorkaniini <ariadne@dereferenced.org>
Mon, 7 Oct 2019 12:12:45 +0000 (12:12 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 7 Oct 2019 12:12:45 +0000 (12:12 +0000)
commitd928f0c4c3f762deb866c55ce01ed22f358db826
treece2481c75ac37f8d6d3fb397316fe4a9be3b2ebc
parent079d069eb43804ffc87f2bb53426d4c8dc34b111
parentc5b7d2ef26a84e81eab57a2f01cdfc446f35ec08
Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'

Pleroma 1.0.91 (aka 1.1 RC2).

See merge request pleroma/pleroma!1811