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

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index df3ccc23ba56ee4f4f46bf8dcffca979b7fb1336,69ec27ba05f1979ebeab7b040aab23bde9b82a29..5cee26afe5d86f3de4f82d86a8b938c6f95310cd
--- 1/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
--- 2/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@@ -5,14 -5,8 +5,12 @@@
  defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
    use Pleroma.Web, :controller
  
-   alias Pleroma.Web
 +  alias Pleroma.Config
 +  alias Pleroma.Stats
 +  alias Pleroma.User
 +  alias Pleroma.Web.Federator.Publisher
 +  alias Pleroma.Web.MastodonAPI.InstanceView
    alias Pleroma.Web.Endpoint
--  alias Pleroma.Web.Nodeinfo.Nodeinfo
  
    def schemas(conn, _params) do
      response = %{

diff --cc priv/static/static/stickers.json
index 978d7b0b57f73e15b9c6e6fbfd2e9ecce49ec84a,0000000000000000000000000000000000000000..a8f4a23c1f34aef4dd40f7e9a62dbd15921ad749
mode 100644,000000..100644
--- 1/priv/static/static/stickers.json
--- /dev/null
+++ b/priv/static/static/stickers.json
@@@ -1,1 -1,0 +1,1 @@@
- {"menhera": "/static/stickers/menhera/", "yotsuba": "/static/stickers/yotsuba/", "yuruyuri": "/static/stickers/yuruyuri/", "bocchi": "/static/stickers/bocchi/", "yurukawa": "/static/stickers/yurukawa/", "gabdrop": "/static/stickers/gabdrop/", "evangelion": "/static/stickers/evangelion/", "shakaijin_kanojo": "/static/stickers/shakaijin_kanojo/", "pko": "/static/stickers/pko/", "ihba": "/static/stickers/ihba/", "azurlane": "/static/stickers/azurlane/", "omesis": "/static/stickers/omesis/"}
++{"menhera": "/static/stickers/menhera/", "yotsuba": "/static/stickers/yotsuba/", "yuruyuri": "/static/stickers/yuruyuri/", "bocchi": "/static/stickers/bocchi/", "yurukawa": "/static/stickers/yurukawa/", "gabdrop": "/static/stickers/gabdrop/", "evangelion": "/static/stickers/evangelion/", "shakaijin_kanojo": "/static/stickers/shakaijin_kanojo/", "pko": "/static/stickers/pko/", "ihba": "/static/stickers/ihba/", "azurlane": "/static/stickers/azurlane/", "omesis": "/static/stickers/omesis/", "molcar": "/static/stickers/molcar/"}