Merge remote-tracking branch 'origin/develop' into reactions

This commit is contained in:
lain 2019-10-05 15:10:57 +02:00
commit 1ed8fbc4d9
10 changed files with 14 additions and 210 deletions

View file

@ -56,7 +56,6 @@ 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