Merge branch 'develop' into 'frontend-admin-api'

# Conflicts:
#   lib/pleroma/web/router.ex

diff --cc CHANGELOG.md
index 5b52acfb4a1ebf55e19cf0440bd2050e875fad7f,c4485b3db600d6b873b51273858c930bd75dc8c9..a80a602dfdf5c934cb9247a14014317d58335260
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -11,8 -11,11 +11,12 @@@ The format is based on [Keep a Changelo
  - Mix task option for force-unfollowing relays
  - 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.
 +- Pleroma API: An endpoint to manage frontends
  - Experimental websocket-based federation between Pleroma instances.
+ - 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
  

diff --cc config/config.exs
Simple merge

diff --cc docs/API/admin_api.md
Simple merge

diff --cc lib/pleroma/web/router.ex
index aba505a661f02b936cfea883434bdc07330b3465,efe67ad7a71a8f8bccb27bbe82b855fa5e75bbf7..e2fe68faa4f8c47afdda3c9dc1e45bd247feb8d6
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -224,8 -244,7 +244,10 @@@ defmodule Pleroma.Web.Router d
      get("/chats/:id/messages", ChatController, :messages)
      delete("/chats/:id/messages/:message_id", ChatController, :delete_message)
  
 +    get("/frontends", FrontendController, :index)
 +    post("/frontends", FrontendController, :install)
++
+     post("/backups", AdminAPIController, :create_backup)
    end
  
    scope "/api/pleroma/emoji", Pleroma.Web.PleromaAPI do