hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into issue/1790-updated-oban

Browse source
This commit is contained in:
Mark Felder 2020-07-10 11:34:53 -05:00
commit 3c0c1fd2ef
220 changed files with 3840 additions and 1938 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/test.exs
View file

@ -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