hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/gen-magic

Browse source
This commit is contained in:
Mark Felder 2020-10-13 10:08:38 -05:00
commit b738f70953
648 changed files with 1286 additions and 494 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.exs
View file

@ -677,7 +677,7 @@ config :pleroma, :rate_limit,
config :pleroma, Pleroma.Workers.PurgeExpiredActivity, enabled: true, min_lifetime: 600
config :pleroma, Pleroma.Plugs.RemoteIp,
config :pleroma, Pleroma.Web.Plugs.RemoteIp,
enabled: true,
headers: ["x-forwarded-for"],
proxies: [],