diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-03-16 11:08:06 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-03-16 11:08:06 +0000 |
| commit | c2527b8c63a4e35b121981efe2c39cc54c77648d (patch) | |
| tree | 9558b7c44e59e70862c3dc1c905019d64f314e17 /config/benchmark.exs | |
| parent | 34fd1c2c9d685c160fd2c20602840bfa9dceb38f (diff) | |
| parent | ba90a6d3e5c1f0a69044ec68748aeed870a085c0 (diff) | |
| download | pleroma-c2527b8c63a4e35b121981efe2c39cc54c77648d.tar.gz pleroma-c2527b8c63a4e35b121981efe2c39cc54c77648d.zip | |
Merge branch 'removing-deprecated' into 'develop'
Removing from descriptions.exs deprecated settings
See merge request pleroma/pleroma!2302
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, |