Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 27 Apr 2020 21:57:16 +0000 (22:57 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 27 Apr 2020 21:57:16 +0000 (22:57 +0100)

Trivial merge