From: sadposter <hannah+pleroma@coffee-and-dreams.uk>
Date: Mon, 13 Sep 2021 15:14:58 +0000 (+0100)
Subject: Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=bd9c9136f9c25ed36b443f0a1985926e1420de7b;p=akkoma

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

bd9c9136f9c25ed36b443f0a1985926e1420de7b
diff --cc lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index df3ccc23b,69ec27ba0..5cee26afe
--- a/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.Config
 +  alias Pleroma.Stats
 +  alias Pleroma.User
-   alias Pleroma.Web
 +  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 978d7b0b5,000000000..a8f4a23c1
mode 100644,000000..100644
--- a/priv/static/static/stickers.json
+++ 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/"}