Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe

diff --cc CHANGELOG.md
Simple merge

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/web/router.ex
index 9695667b6428b354e86f279fcee528714b964b42,74ee23c06c17d4108e1330de1b81fe9f56ca02ca..1f84750b9df84c9ab0872ce9f9216222da230043
--- 1/lib/pleroma/web/router.ex
--- 2/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -100,6 -100,16 +100,10 @@@ defmodule Pleroma.Web.Router d
      plug(Pleroma.Web.Plugs.IdempotencyPlug)
    end
  
 -  pipeline :mastodon_html do
 -    plug(:browser)
 -    plug(:authenticate)
 -    plug(:after_auth)
 -  end
 -
+   pipeline :require_admin do
+     plug(Pleroma.Web.Plugs.UserIsAdminPlug)
+   end
+ 
    pipeline :pleroma_html do
      plug(:browser)
      plug(:authenticate)