diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-11-28 21:51:27 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-11-28 21:51:27 +0300 |
| commit | 50e47a215f9c473a308ba7e9ddea5e33099c5a9d (patch) | |
| tree | c3d0aa424db970f3e7e5c2e911984dad46894896 /config/config.exs | |
| parent | f1b07a2b2b6439579f0a35694f693712fb5ec5f4 (diff) | |
| parent | 5a5ff508aa47d5cf64f7be5938a9561e856854dd (diff) | |
| download | pleroma-50e47a215f9c473a308ba7e9ddea5e33099c5a9d.tar.gz pleroma-50e47a215f9c473a308ba7e9ddea5e33099c5a9d.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/config/config.exs b/config/config.exs index be5257663..f7455cf97 100644 --- a/config/config.exs +++ b/config/config.exs @@ -147,16 +147,6 @@ config :pleroma, Pleroma.Web.Endpoint, "SameSite=Lax" ] -config :pleroma, :fed_sockets, - enabled: false, - connection_duration: :timer.hours(8), - rejection_duration: :timer.minutes(15), - fed_socket_fetches: [ - default: 12_000, - interval: 3_000, - lazy: false - ] - # Configures Elixir's Logger config :logger, :console, level: :debug, |