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

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 458d3a99ab0b90cd66e18bcf6d9fca5e65708eb8..acbb7639a6bfca7bd48b08cd08904bcb3eef89f6 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -222,6 +222,9 @@ config :pleroma, :instance,
     "text/markdown",
     "text/bbcode"
   ],
+  mrf_transparency: true,
+  mrf_transparency_exclusions: [],
+  staff_transparency: [],
   autofollowed_nicknames: [],
   max_pinned_statuses: 1,
   attachment_links: false,
@@ -706,6 +709,8 @@ config :tzdata, :http_client, Pleroma.HTTP.Tzdata
 
 config :ex_aws, http_client: Pleroma.HTTP.ExAws
 
+config :pleroma, :instances_favicons, enabled: false
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"