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

# Conflicts:
#   CHANGELOG.md

diff --cc CHANGELOG.md
index d2f536da8379d86d1400e74555e649a6d75efb87,11820d313a050b4c48952693445d402c1083e9a3..d9410ccf39116169d21d76ab1f64129fbda4b139
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -12,7 -12,7 +12,8 @@@ 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
+ - 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.