Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 28 Dec 2019 17:05:54 +0000 (17:05 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 28 Dec 2019 17:05:54 +0000 (17:05 +0000)

Trivial merge