Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination

diff --cc CHANGELOG.md
index 41f0a4402c7ca010e962c1983b5f7accb841c3ce,03fe51f9db97bfde77e9e2a7774133bc295f0425..5f6e1fe8db41b449bbcbced9a924380417755b7c
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -12,7 -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.
 +- Support pagination of blocks and mutes
+ - 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
  

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