Merge remote-tracking branch 'upstream/develop' into admin-create-users

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 33b7e713d9a69878acadf76883e355247573e74c..68168b279665c34e71cc20185a7a6b1216c64ac7 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -184,9 +184,6 @@ config :mime, :types, %{
   "application/ld+json" => ["activity+json"]
 }
 
-config :pleroma, :websub, Pleroma.Web.Websub
-config :pleroma, :ostatus, Pleroma.Web.OStatus
-config :pleroma, :httpoison, Pleroma.HTTP
 config :tesla, adapter: Tesla.Adapter.Hackney
 
 # Configures http settings, upstream proxy etc.
@@ -314,7 +311,9 @@ config :pleroma, :mrf_simple,
   federated_timeline_removal: [],
   report_removal: [],
   reject: [],
-  accept: []
+  accept: [],
+  avatar_removal: [],
+  banner_removal: []
 
 config :pleroma, :mrf_keyword,
   reject: [],