Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake...
authorlain <lain@soykaf.club>
Thu, 26 Mar 2020 16:24:10 +0000 (17:24 +0100)
committerlain <lain@soykaf.club>
Thu, 26 Mar 2020 16:24:10 +0000 (17:24 +0100)
commit29ab1d9f8d7a73a3e2012eb480a927c3f5f63787
tree6699bf33f30163c2b2e46eb1bf10e4e3e84a6a98
parent0c60c0a76a2fcc8d13992b51704c21a35da10a0b
parent69fc1dd69ff9d63af1785bb0701576cb5cde51f2
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
lib/pleroma/web/activity_pub/pipeline.ex