Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 14 Sep 2019 16:40:40 +0000 (17:40 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 14 Sep 2019 16:40:40 +0000 (17:40 +0100)

Trivial merge