moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'reactions' 

# Conflicts:
#   priv/static/schemas/litepub-0.1.jsonld
This commit is contained in:
lain 2019-10-07 12:10:27 +00:00
parent d580eedfe9 5c32e6ee91
commit e8395bedd2
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
priv/static/schemas/litepub-0.1.jsonld
View File

@ -14,9 +14,8 @@
"discoverable": "toot:discoverable", "discoverable": "toot:discoverable",
"manuallyApprovesFollowers": "as:manuallyApprovesFollowers", "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
"ostatus": "http://ostatus.org#", "ostatus": "http://ostatus.org#",
"schema": "http://schema.org", "schema": "http://schema.org#",
"toot": "http://joinmastodon.org/ns#", "toot": "http://joinmastodon.org/ns#",
"totalItems": "as:totalItems",
"value": "schema:value", "value": "schema:value",
"sensitive": "as:sensitive", "sensitive": "as:sensitive",
"litepub": "http://litepub.social/ns#", "litepub": "http://litepub.social/ns#",
@ -29,10 +28,6 @@
"@id": "litepub:oauthRegistrationEndpoint", "@id": "litepub:oauthRegistrationEndpoint",
"@type": "@id" "@type": "@id"
}, },
"uploadMedia": {
"@id": "litepub:uploadMedia",
"@type": "@id"
},
"EmojiReaction": "litepub:EmojiReaction" "EmojiReaction": "litepub:EmojiReaction"
} }
] ]