diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-19 19:25:50 +0100 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-19 19:25:50 +0100 |
| commit | a8aa91753024dbd211e5e3952f5b305debaa8b55 (patch) | |
| tree | 01088f8cec46c4b437b338cb78aaaee65e5d8bc7 /config/benchmark.exs | |
| parent | c1fd4f665335ba67336bd1b2fab2d9df5e247e08 (diff) | |
| parent | 952cb589f47972bba8f9b94b2935a60f05e21bd3 (diff) | |
| download | pleroma-a8aa91753024dbd211e5e3952f5b305debaa8b55.tar.gz pleroma-a8aa91753024dbd211e5e3952f5b305debaa8b55.zip | |
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
Diffstat (limited to 'config/benchmark.exs')
| -rw-r--r-- | config/benchmark.exs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/benchmark.exs b/config/benchmark.exs index 84c6782a2..ff59395cf 100644 --- a/config/benchmark.exs +++ b/config/benchmark.exs @@ -61,8 +61,6 @@ config :web_push_encryption, :vapid_details, config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock -config :pleroma_job_queue, disabled: true - config :pleroma, Pleroma.ScheduledActivity, daily_user_limit: 2, total_user_limit: 3, |