From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Mon, 27 Jul 2020 21:20:52 +0000 (+0000)
Subject: Merge branch 'embedded-object-federation' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;ds=sidebyside;h=057936bf0b5af2cc35a6ecb1c800a841ca4760a8;hp=057936bf0b5af2cc35a6ecb1c800a841ca4760a8;p=akkoma

Merge branch 'embedded-object-federation' into 'develop'

Embedded object federation

Closes #1959

See merge request pleroma/pleroma!2794
---