diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-10-08 17:24:09 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-10-08 17:24:09 -0500 |
| commit | 3f9263fb16ad519d2dd45106549a8ba42b68fc1f (patch) | |
| tree | a48eb564f7f037a876a4d2131f8571aa33702b22 /config/benchmark.exs | |
| parent | 24ce9c011caf7401fb261c7df4196b2ef9ba3d90 (diff) | |
| parent | 74be4de3f6c2c34447029649526637411acfa9f3 (diff) | |
| download | pleroma-3f9263fb16ad519d2dd45106549a8ba42b68fc1f.tar.gz pleroma-3f9263fb16ad519d2dd45106549a8ba42b68fc1f.zip | |
Merge remote-tracking branch 'upstream/develop' into restrict-origin
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 e867253eb..5567ff26e 100644 --- a/config/benchmark.exs +++ b/config/benchmark.exs @@ -59,8 +59,6 @@ config :web_push_encryption, :vapid_details, "BLH1qVhJItRGCfxgTtONfsOKDc9VRAraXw-3NsmjMngWSh7NxOizN6bkuRA7iLTMPS82PjwJAr3UoK9EC1IFrz4", private_key: "_-XZ0iebPrRfZ_o0-IatTdszYa8VCH1yLN-JauK7HHA" -config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock - config :pleroma, Pleroma.ScheduledActivity, daily_user_limit: 2, total_user_limit: 3, |