diff options
| author | lain <lain@soykaf.club> | 2020-08-05 11:12:14 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-05 11:12:14 +0200 |
| commit | 19c108170edb2d72d52c56d82475b565e6fd6b36 (patch) | |
| tree | b01fd98f491c60132c424b3c00ebb87c1aa31be6 /config | |
| parent | 878c7f3f309aa5aaa9eababc2c863248dd4420bb (diff) | |
| parent | 474aba984f2184d4f028c56f687d1a12f69d5c47 (diff) | |
| download | pleroma-19c108170edb2d72d52c56d82475b565e6fd6b36.tar.gz pleroma-19c108170edb2d72d52c56d82475b565e6fd6b36.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
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 |