Merge remote-tracking branch 'upstream/develop' into oauth-token-id

diff --combined docs/development/API/differences_in_mastoapi_responses.md
index 3552b12fbe98ba07f1b4820a883ae54dab5bd278,2ff56d3cae39aefc2a548863c0a508a8e4801cc8..6c1ecb559671e557032f59724a598baa8ceef543
--- 1/docs/development/API/differences_in_mastoapi_responses.md
--- 2/docs/development/API/differences_in_mastoapi_responses.md
+++ b/docs/development/API/differences_in_mastoapi_responses.md
@@@ -38,6 -38,7 +38,7 @@@ Has these additional fields under the `
  - `thread_muted`: true if the thread the post belongs to is muted
  - `emoji_reactions`: A list with emoji / reaction maps. The format is `{name: "☕", count: 1, me: true}`. Contains no information about the reacting users, for that use the `/statuses/:id/reactions` endpoint.
  - `parent_visible`: If the parent of this post is visible to the user or not.
+ - `pinned_at`: a datetime (iso8601) when status was pinned, `null` otherwise.
  
  ## Scheduled statuses
  
@@@ -255,29 -256,9 +256,29 @@@ This information is returned in the `/a
  
  *Pleroma supports refreshing tokens.*
  
 -`POST /oauth/token`
 +### POST `/oauth/token`
  
 -Post here request with `grant_type=refresh_token` to obtain new access token. Returns an access token.
 +You can obtain access tokens for a user in a few additional ways.
 +
 +#### Refreshing a token
 +
 +To obtain a new access token from a refresh token, pass `grant_type=refresh_token` with the following extra parameters:
 +
 +- `refresh_token`: The refresh token.
 +
 +#### Getting a token with a password
 +
 +To obtain a token from a user's password, pass `grant_type=password` with the following extra parameters:
 +
 +- `username`: Username to authenticate.
 +- `password`: The user's password.
 +
 +#### Response body
 +
 +Additional fields are returned in the response:
 +
 +- `id`: The primary key of this token in Pleroma's database.
 +- `me` (user tokens only): The ActivityPub ID of the user who owns the token.
  
  ## Account Registration