[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limite...

# Conflicts:
#	CHANGELOG.md

diff --cc CHANGELOG.md
index 2ef60ea9b409052e468c070e5768bb613f056ccd,3d9424c8fdb977788031a92b85276bade90bd328..4ae1079fe89d7a54d4fc041262222fc4beb1a5fb
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -93,9 -112,11 +112,12 @@@ The format is based on [Keep a Changelo
  - Pleroma API: Add `/api/v1/pleroma/accounts/confirmation_resend?email=<email>` for resending account confirmation.
  - Pleroma API: Email change endpoint.
  - Admin API: Added moderation log
+ - Support for `X-Forwarded-For` and similar HTTP headers which used by reverse proxies to pass a real user IP address to the backend. Must not be enabled unless your instance is behind at least one reverse proxy (such as Nginx, Apache HTTPD or Varnish Cache).
  - Web response cache (currently, enabled for ActivityPub)
  - Mastodon API: Added an endpoint to get multiple statuses by IDs (`GET /api/v1/statuses/?ids[]=1&ids[]=2`)
+ - ActivityPub: Add ActivityPub actor's `discoverable` parameter.
+ - Admin API: Added moderation log filters (user/start date/end date/search/pagination)
 +- Authentication: Added rate limit for password-authorized actions / login existence checks. 
  
  ### Changed
  - Configuration: Filter.AnonymizeFilename added ability to retain file extension with custom text

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc lib/pleroma/web/oauth/oauth_controller.ex
Simple merge