Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 11 Aug 2019 20:03:20 +0000 (21:03 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 11 Aug 2019 20:03:20 +0000 (21:03 +0100)

Trivial merge