diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-08 14:52:33 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-08 14:52:33 +0000 |
| commit | 9e49f4627fd0346cf88d44c4ab8c46c740aab36e (patch) | |
| tree | 7d273045de8ad3acb867503ec6728807083d6d70 /config/test.exs | |
| parent | 0a05670b4499d170f6bc0eaecfae0d71be022227 (diff) | |
| parent | f6723dc9bd4f05319835158be9937dda4400feb9 (diff) | |
| download | pleroma-9e49f4627fd0346cf88d44c4ab8c46c740aab36e.tar.gz pleroma-9e49f4627fd0346cf88d44c4ab8c46c740aab36e.zip | |
Merge branch 'bugfix/favicon-empty-test' into 'develop'
Bugfix/favicon empty test
See merge request pleroma/pleroma!2972
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/test.exs b/config/test.exs index e9c2273e8..0ee6f1b7f 100644 --- a/config/test.exs +++ b/config/test.exs @@ -114,8 +114,6 @@ config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true -config :pleroma, :instances_favicons, enabled: false - config :pleroma, Pleroma.Uploaders.S3, bucket: nil, streaming_enabled: true, |