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/test.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/test.exs')
| -rw-r--r-- | config/test.exs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/test.exs b/config/test.exs index 7cc660e3c..2a20a03e7 100644 --- a/config/test.exs +++ b/config/test.exs @@ -19,11 +19,6 @@ config :logger, :console, level: :warn, format: "\n[$level] $message\n" -config :pleroma, :fed_sockets, - enabled: false, - connection_duration: 5, - rejection_duration: 5 - config :pleroma, :auth, oauth_consumer_strategies: [] config :pleroma, Pleroma.Upload, |