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

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

# Conflicts:
#   CHANGELOG.md
---

1cc8e945064319014300de5880a326d1100bf43e
diff --cc CHANGELOG.md
index d2f536da8,11820d313..d9410ccf3
--- a/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.