Merge branch 'feature/allow-user-query-via-id' into 'develop'

Admin API: Allow querying user by ID

See merge request pleroma/pleroma!1380

diff --combined CHANGELOG.md
index 6d43bfe9064cf7d3fd4349f3cf73e602a603c713,3473e8acbdcdfd90b72383e83f7ed2c352f67fc2..b9212984951e23409d3ea67484a40b4b46509968
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -8,9 -8,10 +8,10 @@@ The format is based on [Keep a Changelo
  - MRF: Support for priming the mediaproxy cache (`Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`)
  Configuration: `federation_incoming_replies_max_depth` option
  - Mastodon API: Support for the [`tagged` filter](https://github.com/tootsuite/mastodon/pull/9755) in [`GET /api/v1/accounts/:id/statuses`](https://docs.joinmastodon.org/api/rest/accounts/#get-api-v1-accounts-id-statuses)
+ - Mastodon API, streaming: Add support for passing the token in the `Sec-WebSocket-Protocol` header
  - Admin API: Return users' tags when querying reports
  - Admin API: Return avatar and display name when querying users
- - Mastodon API, streaming: Add support for passing the token in the `Sec-WebSocket-Protocol` header
+ - Admin API: Allow querying user by ID
  - Added synchronization of following/followers counters for external users
  
  ### Fixed
@@@ -85,7 -86,6 +86,7 @@@
  - OAuth: added job to clean expired access tokens
  - MRF: Support for rejecting reports from specific instances (`mrf_simple`)
  - MRF: Support for stripping avatars and banner images from specific instances (`mrf_simple`)
 +- Ability to reset avatar, profile banner and backgroud
  - MRF: Support for running subchains.
  - Configuration: `skip_thread_containment` option
  - Configuration: `rate_limit` option. See `Pleroma.Plugs.RateLimiter` documentation for details.