From: lain <lain@soykaf.club>
Date: Wed, 4 Nov 2020 10:47:41 +0000 (+0100)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c7bcbfbc1d5d34463634e44979a77a2c47e35dbc;p=akkoma

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
---

c7bcbfbc1d5d34463634e44979a77a2c47e35dbc
diff --cc CHANGELOG.md
index d9410ccf3,2ee17d239..b7ca47949
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -12,12 -12,11 +12,13 @@@ 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.
+ - Account backup
  - 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.