diff options
| author | lain <lain@soykaf.club> | 2021-01-26 14:24:32 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-26 14:24:32 +0000 |
| commit | 229acae6c3da541ebb0438cb7f310cdce1df92b3 (patch) | |
| tree | 8b93f46ac090021e7e53db392ba54a3c48b31fda /config/test.exs | |
| parent | 71166b30a42ad3a8988049992bcab93c7e2ed656 (diff) | |
| parent | 250e2020987b1fc65251ba9564e41b38ba060391 (diff) | |
| download | pleroma-229acae6c3da541ebb0438cb7f310cdce1df92b3.tar.gz pleroma-229acae6c3da541ebb0438cb7f310cdce1df92b3.zip | |
Merge branch 'develop' into '2435-list-multiple-users'
# Conflicts:
# CHANGELOG.md
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: [] |