From: minibikini <egor@kislitsyn.com>
Date: Tue, 27 Oct 2020 18:59:19 +0000 (+0000)
Subject: Merge branch 'develop' into 'feature/local-only-scope'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1bfd8528bbc71c8c34253eb245de7df498064fb4;p=akkoma

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

# Conflicts:
#   CHANGELOG.md
---

1bfd8528bbc71c8c34253eb245de7df498064fb4
diff --cc CHANGELOG.md
index f06381760,ac91d4d9e..361ad5038
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -12,8 -12,8 +12,10 @@@ 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
+ - App metrics: ability to restrict access to specified IP whitelist.
+ 
 +
  ### Changed
  
  - **Breaking** Requires `libmagic` (or `file`) to guess file types.