diff options
| author | Mark Felder <feld@feld.me> | 2021-01-25 09:45:06 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-25 09:45:06 -0600 |
| commit | 537ba1c5e07a33692ed63ca50b50e240efce6f88 (patch) | |
| tree | 2a364998d729d1f65d5b87b5703604ac8d163678 /config/test.exs | |
| parent | 28581e03ad5761aa484a7fa427be8ab5695f0892 (diff) | |
| parent | 0a6f5f479348eff5f5404d4455fcb8254809812f (diff) | |
| download | pleroma-537ba1c5e07a33692ed63ca50b50e240efce6f88.tar.gz pleroma-537ba1c5e07a33692ed63ca50b50e240efce6f88.zip | |
Merge branch 'develop' into refactor/deactivated_user_field
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 6f6b18558..690c98e40 100644 --- a/config/test.exs +++ b/config/test.exs @@ -115,11 +115,6 @@ config :pleroma, Pleroma.Web.Plugs.RemoteIp, enabled: false config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true -config :pleroma, Pleroma.Uploaders.S3, - bucket: nil, - streaming_enabled: true, - public_endpoint: nil - config :tzdata, :autoupdate, :disabled config :pleroma, :mrf, policies: [] |