Merge branch 'develop' into 'feature/local-only-scope'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index f063817603f5449f859949fc8d4a20d0c519e592,ac91d4d9ee9f710990675479eb00f83296dc4281..361ad503887be36bd8a99f290d824078cc66d064
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -12,8 -12,8 +12,10 @@@ The format is based on [Keep a Changelo
  - Media preview proxy (requires `ffmpeg` and `ImageMagick` to be installed and media proxy to be enabled; see `:media_preview_proxy` config for more details).
  - Pleroma API: Importing the mutes users from CSV files.
  - Experimental websocket-based federation between Pleroma instances.
 +- Support for local-only statuses
+ - App metrics: ability to restrict access to specified IP whitelist.
+ 
 +
  ### Changed
  
  - **Breaking** Requires `libmagic` (or `file`) to guess file types.

diff --cc lib/pleroma/web/common_api/utils.ex
Simple merge

diff --cc test/pleroma/web/common_api_test.exs
Simple merge

diff --cc test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
Simple merge