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

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads

Browse source
This commit is contained in:
lain 2020-08-06 15:22:20 +02:00
commit bf95dfb240
31 changed files with 358 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/test.exs
View file

@ -120,6 +120,8 @@ config :pleroma, Pleroma.Uploaders.S3,
config :tzdata, :autoupdate, :disabled
config :pleroma, :mrf, policies: []
if File.exists?("./config/test.secret.exs") do
import_config "test.secret.exs"
else