Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 10 Oct 2019 09:28:16 +0000 (10:28 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 10 Oct 2019 09:28:16 +0000 (10:28 +0100)

Trivial merge