diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-12-17 09:04:43 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-12-17 09:05:36 -0600 |
| commit | 80891e83d8df25b742a321d2c837e38c805e6582 (patch) | |
| tree | 915321403b8a1639fa317b72d438b8a61a0eb090 /config/test.exs | |
| parent | 4999efad3f0bb0a70a5be5d5c2b970ab564668ca (diff) | |
| parent | 8b8c317c0ff1534d3296369ba315b8919e8dc55c (diff) | |
| download | pleroma-80891e83d8df25b742a321d2c837e38c805e6582.tar.gz pleroma-80891e83d8df25b742a321d2c837e38c805e6582.zip | |
Merge remote-tracking branch 'upstream/develop' into registration-workflow
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, |