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

[akkoma] / config / test.exs

diff --git a/config/test.exs b/config/test.exs
index abcf793e5934138b3384d615c6881dfd0429745b..413c7f0b91ab2f81937d13c0a0a3b6c6d185aff8 100644 (file)
--- a/config/test.exs
+++ b/config/test.exs
@@ -118,6 +118,10 @@ config :pleroma, Pleroma.Uploaders.S3,
   streaming_enabled: true,
   public_endpoint: nil
 
+config :tzdata, :autoupdate, :disabled
+
+config :pleroma, :mrf, policies: []
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else