summaryrefslogtreecommitdiff
path: root/test/fixtures
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-10-25 05:30:52 +0000
committerkaniini <nenolod@gmail.com>2018-10-25 05:30:52 +0000
commit63556150e1226baceb4ae152376243f6bf691249 (patch)
tree9f83d8cb0b83111de9a9b07b92413adedf2e355a /test/fixtures
parent9e9b1bd5ea31352025dfe2f8138eedd1092a325e (diff)
parentb1d1f9bc271d80f05b2f636e304775e6803c02f6 (diff)
downloadpleroma-63556150e1226baceb4ae152376243f6bf691249.tar.gz
pleroma-63556150e1226baceb4ae152376243f6bf691249.zip
Merge branch 'bugfix/user-inbox-bcc' into 'develop'
activitypub: splice users into recipient lists when they receive messages at their personal inbox Closes #343 See merge request pleroma/pleroma!390
Diffstat (limited to 'test/fixtures')
-rw-r--r--test/fixtures/mastodon-post-activity.json1
1 files changed, 0 insertions, 1 deletions
diff --git a/test/fixtures/mastodon-post-activity.json b/test/fixtures/mastodon-post-activity.json
index 693e0ce39..b91263431 100644
--- a/test/fixtures/mastodon-post-activity.json
+++ b/test/fixtures/mastodon-post-activity.json
@@ -21,7 +21,6 @@
"http://localtesting.pleroma.lol/users/lain"
],
"id": "http://mastodon.example.org/users/admin/statuses/99512778738411822/activity",
- "nickname": "lain",
"object": {
"atomUri": "http://mastodon.example.org/users/admin/statuses/99512778738411822",
"attachment": [],