From: feld <feld@feld.me>
Date: Tue, 27 Oct 2020 22:13:50 +0000 (+0000)
Subject: Merge branch 'develop' into 'feature/autofollowing'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=03a318af9ac1cc86e1201d6f55babd06c0b5ecd9;p=akkoma

Merge branch 'develop' into 'feature/autofollowing'

# Conflicts:
#   CHANGELOG.md
---

03a318af9ac1cc86e1201d6f55babd06c0b5ecd9
diff --cc CHANGELOG.md
index ced8a2d5f,ac91d4d9e..6265d6127
--- a/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.