merge conflict
This commit is contained in:
commit
a80ce71399
@ -2,5 +2,6 @@
|
||||
{
|
||||
"inbox": "http://happy-dev.fr/owl/#inbox",
|
||||
"object": "http://happy-dev.fr/owl/#object",
|
||||
"author": "http://happy-dev.fr/owl/#author"
|
||||
"author": "http://happy-dev.fr/owl/#author",
|
||||
"account": "http://happy-dev.fr/owl/#account"
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user