Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 15 Dec 2019 14:11:26 +0000 (14:11 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 15 Dec 2019 14:11:26 +0000 (14:11 +0000)

Trivial merge