Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator

This commit is contained in:
lain 2020-06-23 10:17:12 +02:00
commit 2c603f2009
71 changed files with 1965 additions and 370 deletions

View file

@ -1415,9 +1415,6 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
assert modified_object["inReplyToAtomUri"] == "https://shitposter.club/notice/2827873"
assert modified_object["conversation"] ==
"tag:shitposter.club,2017-05-05:objectType=thread:nonce=3c16e9c2681f6d26"
assert modified_object["context"] ==
"tag:shitposter.club,2017-05-05:objectType=thread:nonce=3c16e9c2681f6d26"
end