Merge branch 'develop' into 'feature/autofollowing'

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index ced8a2d5f40ea774dc00514fa744b9500c153740,ac91d4d9ee9f710990675479eb00f83296dc4281..6265d6127ba025a9280f0898ed5e8e893604de5b
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -12,9 -12,8 +12,9 @@@ 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.
+ - App metrics: ability to restrict access to specified IP whitelist.
 +- Configuration: Add `:instance, autofollowing_nicknames` setting to provide a way to make accounts automatically follow new users that register on the local Pleroma instance.
  
- 
  ### Changed
  
  - **Breaking** Requires `libmagic` (or `file`) to guess file types.

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge