Merge branch 'develop' into 'reactions'
# Conflicts: # priv/static/schemas/litepub-0.1.jsonld
This commit is contained in:
commit
e8395bedd2
|
@ -14,9 +14,8 @@
|
|||
"discoverable": "toot:discoverable",
|
||||
"manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
|
||||
"ostatus": "http://ostatus.org#",
|
||||
"schema": "http://schema.org",
|
||||
"schema": "http://schema.org#",
|
||||
"toot": "http://joinmastodon.org/ns#",
|
||||
"totalItems": "as:totalItems",
|
||||
"value": "schema:value",
|
||||
"sensitive": "as:sensitive",
|
||||
"litepub": "http://litepub.social/ns#",
|
||||
|
@ -29,10 +28,6 @@
|
|||
"@id": "litepub:oauthRegistrationEndpoint",
|
||||
"@type": "@id"
|
||||
},
|
||||
"uploadMedia": {
|
||||
"@id": "litepub:uploadMedia",
|
||||
"@type": "@id"
|
||||
},
|
||||
"EmojiReaction": "litepub:EmojiReaction"
|
||||
}
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue