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

diff --cc CHANGELOG.md
index d9410ccf39116169d21d76ab1f64129fbda4b139,2ee17d239dde32fbb707d3bc3dd47c4fc32d57af..b7ca479494bc4f1342a4a820345f89ef0ada0d72
--- 1/CHANGELOG.md
--- 2/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.

diff --cc lib/pleroma/activity.ex
Simple merge

diff --cc lib/pleroma/web/common_api.ex
Simple merge