Merge branch 'final-release-prep' into 'maint/1.1'
authorrinpatch <rinpatch@sdf.org>
Mon, 14 Oct 2019 18:21:49 +0000 (18:21 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 14 Oct 2019 18:21:49 +0000 (18:21 +0000)
Final 1.1 release preparations

See merge request pleroma/pleroma!1843


Trivial merge