Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 7 Apr 2020 17:02:33 +0000 (18:02 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 7 Apr 2020 17:02:33 +0000 (18:02 +0100)

Trivial merge