Merge branch 'develop' into gitlab-mr-iid-4381

2026-05-14 09:27:13 +00:00 · 2026-05-14 09:27:13 +00:00 · 4fe802b25a
commit 4fe802b25a
parent 784a319f2e 093b156c65
28 changed files with 1300 additions and 119 deletions
--- a/config/config.exs
+++ b/config/config.exs
@ -737,6 +737,7 @@ config :pleroma, Pleroma.Workers.PurgeExpiredActivity, enabled: true, min_lifeti
 config :pleroma, Pleroma.Web.Plugs.RemoteIp,
  enabled: true,
  headers: ["x-forwarded-for"],
+  clients: [],
  proxies: [],
  reserved: [
    "127.0.0.0/8",