Merge branch 'embedded-object-federation' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Mon, 27 Jul 2020 21:20:52 +0000 (21:20 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Mon, 27 Jul 2020 21:20:52 +0000 (21:20 +0000)
Embedded object federation

Closes #1959

See merge request pleroma/pleroma!2794


Trivial merge