diff options
author | rinpatch <rinpatch@sdf.org> | 2019-07-20 22:04:47 +0300 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2019-07-20 22:04:47 +0300 |
commit | 196cad46f35a63c18d58cd5d982bc4e1f9b0d7c3 (patch) | |
tree | 51fa0436998541c3bcc1885eaa2188d7dbb7d469 /priv/static | |
parent | c3ecaea64dd377b586e3b2a5316e90884ec78fe6 (diff) | |
parent | fe548f322e834c7c81678a460c54c71f1198021c (diff) | |
download | pleroma-196cad46f35a63c18d58cd5d982bc4e1f9b0d7c3.tar.gz pleroma-196cad46f35a63c18d58cd5d982bc4e1f9b0d7c3.zip |
Resolve merge conflicts
Diffstat (limited to 'priv/static')
-rw-r--r-- | priv/static/schemas/litepub-0.1.jsonld | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/priv/static/schemas/litepub-0.1.jsonld b/priv/static/schemas/litepub-0.1.jsonld index f36b231c5..57ed05eba 100644 --- a/priv/static/schemas/litepub-0.1.jsonld +++ b/priv/static/schemas/litepub-0.1.jsonld @@ -20,6 +20,10 @@ "sensitive": "as:sensitive", "litepub": "http://litepub.social/ns#", "directMessage": "litepub:directMessage", + "listMessage": { + "@id": "litepub:listMessage", + "@type": "@id" + }, "oauthRegistrationEndpoint": { "@id": "litepub:oauthRegistrationEndpoint", "@type": "@id" |