Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote...
authorlain <lain@soykaf.club>
Tue, 28 Jan 2020 16:52:42 +0000 (17:52 +0100)
committerlain <lain@soykaf.club>
Tue, 28 Jan 2020 16:52:42 +0000 (17:52 +0100)

Trivial merge