From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Thu, 29 Oct 2020 11:35:42 +0000 (+0400)
Subject: Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=fa902867c07212a7d2936a953037c22a40cda51e;p=akkoma

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

fa902867c07212a7d2936a953037c22a40cda51e
diff --cc CHANGELOG.md
index 41f0a4402,03fe51f9d..5f6e1fe8d
--- a/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