diff options
| author | lain <lain@soykaf.club> | 2019-10-07 12:10:27 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-07 12:10:27 +0000 |
| commit | e8395bedd2164723b641e1e28cf08e40875893bf (patch) | |
| tree | dbe9efd197de60726b6ce1d11d0d845b0a0e3ee4 | |
| parent | d580eedfe93ef08fea7869945c0fd4fe908cb82d (diff) | |
| parent | 5c32e6ee91b99200c33570017f6dc04bca8c1523 (diff) | |
| download | pleroma-e8395bedd2164723b641e1e28cf08e40875893bf.tar.gz | |
Merge branch 'develop' into 'reactions'
# Conflicts:
# priv/static/schemas/litepub-0.1.jsonld
| -rw-r--r-- | priv/static/schemas/litepub-0.1.jsonld | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/priv/static/schemas/litepub-0.1.jsonld b/priv/static/schemas/litepub-0.1.jsonld index 5e44ad819..96665844e 100644 --- a/priv/static/schemas/litepub-0.1.jsonld +++ b/priv/static/schemas/litepub-0.1.jsonld @@ -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" } ] |