diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-08 17:21:12 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-08 17:21:12 +0000 |
| commit | 425324aae3d4534bc045466a1cc15653ddfa27d2 (patch) | |
| tree | 2d785eb4396e2dc79bb6b0bed5d766b393479dd5 /config/test.exs | |
| parent | 73dd5bdb7dcdf804bdbabcf632671d4de5042ebc (diff) | |
| parent | 073f5490ece616fd9602382c1be1347457cbbe79 (diff) | |
Merge branch 'release/2.1.1' into 'stable'v2.1.1
2.1.1 release
See merge request pleroma/secteam/pleroma!13
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index f0358e384..e9c2273e8 100644 --- a/config/test.exs +++ b/config/test.exs @@ -114,7 +114,7 @@ config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true -config :pleroma, :instances_favicons, enabled: true +config :pleroma, :instances_favicons, enabled: false config :pleroma, Pleroma.Uploaders.S3, bucket: nil, |