diff options
| author | lain <lain@soykaf.club> | 2020-08-06 15:22:20 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-06 15:22:20 +0200 |
| commit | bf95dfb240cff8c5a2f8a0930e5309a09ca00ba1 (patch) | |
| tree | 3a0c81155e7ae38e27008a7c066e8bc03fb1b410 /config | |
| parent | 532d6f94aea5d4f53e846b8b77296f80a9ae68a0 (diff) | |
| parent | 10b0e55acffeeff5842421c12b3b26feb35336de (diff) | |
| download | pleroma-bf95dfb240cff8c5a2f8a0930e5309a09ca00ba1.tar.gz pleroma-bf95dfb240cff8c5a2f8a0930e5309a09ca00ba1.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
Diffstat (limited to 'config')
| -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 db0655e73..413c7f0b9 100644 --- a/config/test.exs +++ b/config/test.exs @@ -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 |