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)
commit057936bf0b5af2cc35a6ecb1c800a841ca4760a8
tree5f7aebf08a4cb5c2b2f020b5122c885f1a50ec6a
parent2a3abfd326f0cbb588dfe66a23e9783be3038a5e
parent9e6f4694dd21f92bb2292e819d0f7f1cad149887
Merge branch 'embedded-object-federation' into 'develop'

Embedded object federation

Closes #1959

See merge request pleroma/pleroma!2794