Merge branch 'from/upstream-develop/tusooa/edits' into 'develop'
Editing Closes #1429, #2859, and #2288 See merge request pleroma/pleroma!3678
This commit is contained in:
commit
e40c221c31
67 changed files with 3309 additions and 119 deletions
|
|
@ -36,7 +36,8 @@
|
|||
"@id": "as:alsoKnownAs",
|
||||
"@type": "@id"
|
||||
},
|
||||
"vcard": "http://www.w3.org/2006/vcard/ns#"
|
||||
"vcard": "http://www.w3.org/2006/vcard/ns#",
|
||||
"formerRepresentations": "litepub:formerRepresentations"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue