diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-10-13 19:22:32 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-10-13 19:22:32 -0500 |
| commit | b3d6cf90229ff3e9a5bd0028d4a6cbd3b68da9fe (patch) | |
| tree | 09f6b8bafcfb784c581800887d80a22d0461af0b /config/config.exs | |
| parent | 5c8d2c468c3a14cde029e7aeedd0cdb580cce1df (diff) | |
| parent | 481906207e6d803e5c4d3e455c7b93119e392177 (diff) | |
| download | pleroma-b3d6cf90229ff3e9a5bd0028d4a6cbd3b68da9fe.tar.gz pleroma-b3d6cf90229ff3e9a5bd0028d4a6cbd3b68da9fe.zip | |
Merge remote-tracking branch 'upstream/develop' into block-behavior
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index befc6840d..0853a5946 100644 --- a/config/config.exs +++ b/config/config.exs @@ -678,7 +678,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: [], |