summaryrefslogtreecommitdiff
path: root/test/fixtures
diff options
context:
space:
mode:
authorRin Toshaka <rinpatch@sdf.org>2018-12-30 21:00:40 +0100
committerRin Toshaka <rinpatch@sdf.org>2018-12-30 21:00:40 +0100
commitdec23500d8988c22a99f049ef1d1e49328ba075a (patch)
treea6e16c5fa60b02058b1ebd985f20ac8f0f4ffa5b /test/fixtures
parentab3089d6a718d4a70b0d702307d41e64e17bc505 (diff)
parentdfde2622d0c14195392e306fadc7c729c68da273 (diff)
downloadpleroma-dec23500d8988c22a99f049ef1d1e49328ba075a.tar.gz
pleroma-dec23500d8988c22a99f049ef1d1e49328ba075a.zip
Resolve merge conflict
Diffstat (limited to 'test/fixtures')
-rw-r--r--test/fixtures/activitypub-client-post-activity.json9
1 files changed, 9 insertions, 0 deletions
diff --git a/test/fixtures/activitypub-client-post-activity.json b/test/fixtures/activitypub-client-post-activity.json
new file mode 100644
index 000000000..c985e072b
--- /dev/null
+++ b/test/fixtures/activitypub-client-post-activity.json
@@ -0,0 +1,9 @@
+{
+ "@context": ["https://www.w3.org/ns/activitystreams", {"@language": "en-GB"}],
+ "type": "Create",
+ "object": {
+ "type": "Note",
+ "content": "It's a note"
+ },
+ "to": ["https://www.w3.org/ns/activitystreams#Public"]
+}