hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into 'reactions'

Browse source 
# Conflicts:
#   CHANGELOG.md
This commit is contained in:
lain 2019-10-06 08:11:47 +00:00
commit 61097ba6ab
28 changed files with 592 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/API/differences_in_mastoapi_responses.md
View file

@ -56,6 +56,7 @@ Has these additional fields under the `pleroma` object:
- `settings_store`: A generic map of settings for frontends. Opaque to the backend. Only returned in `verify_credentials` and `update_credentials`
- `chat_token`: The token needed for Pleroma chat. Only returned in `verify_credentials`
- `deactivated`: boolean, true when the user is deactivated
- `unread_conversation_count`: The count of unread conversations. Only returned to the account owner.
### Source