diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-07-10 11:34:53 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-07-10 11:34:53 -0500 |
| commit | 3c0c1fd2efa981f18091782434c1f0ac77462b8e (patch) | |
| tree | 7776233f9248d4e1caee6ad859af3a524347d926 /config/test.exs | |
| parent | d7a37fddd1fc5169ae8c714d0baf8e5372a5f1d5 (diff) | |
| parent | ce9514000db1e08a69b8874f21e66261b9261d86 (diff) | |
| download | pleroma-3c0c1fd2efa981f18091782434c1f0ac77462b8e.tar.gz pleroma-3c0c1fd2efa981f18091782434c1f0ac77462b8e.zip | |
Merge branch 'develop' into issue/1790-updated-oban
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index 054fac355..d45c36b7b 100644 --- a/config/test.exs +++ b/config/test.exs @@ -111,6 +111,8 @@ config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true +config :pleroma, :instances_favicons, enabled: true + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |