Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object...
authorlain <lain@soykaf.club>
Mon, 27 Jul 2020 14:19:45 +0000 (16:19 +0200)
committerlain <lain@soykaf.club>
Mon, 27 Jul 2020 14:19:45 +0000 (16:19 +0200)

Trivial merge