diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-08-05 17:46:24 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-08-05 17:46:24 +0300 |
| commit | 2299bfe4c19697e7c0250e052d3496533595c58b (patch) | |
| tree | 798b789f4cf68be68658765af0547b908640f271 /config/test.exs | |
| parent | 97b57014496003cabb416766457552ef854fa658 (diff) | |
| parent | 474aba984f2184d4f028c56f687d1a12f69d5c47 (diff) | |
| download | pleroma-2299bfe4c19697e7c0250e052d3496533595c58b.tar.gz pleroma-2299bfe4c19697e7c0250e052d3496533595c58b.zip | |
Merge branch 'develop' into refactor/config-get
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 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 |