Merge branch 'features/favicons' into 'develop'

Add support for remote favicons See merge request pleroma/pleroma!2261
2020-07-09 13:09:31 +00:00 · 2020-07-09 13:09:31 +00:00 · f4469dc741
commit f4469dc741
parent bdc7b60610 31fef95e35
13 changed files with 440 additions and 2 deletions
--- a/config/description.exs
+++ b/config/description.exs
@ -3448,5 +3448,18 @@ config :pleroma, :config_description, [
        suggestions: [false]
      }
    ]
+  },
+  %{
+    group: :pleroma,
+    key: :instances_favicons,
+    type: :group,
+    description: "Control favicons for instances",
+    children: [
+      %{
+        key: :enabled,
+        type: :boolean,
+        description: "Allow/disallow displaying and getting instances favicons"
+      }
+    ]
  }
 ]