diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-08-04 19:17:30 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-08-04 19:17:30 +0000 |
| commit | b1b6a7dfa890a6ae16f49d2f91e2ebdbaecf1724 (patch) | |
| tree | 74c5ef004429c45a4d801ee9e18170ec22174464 /config/test.exs | |
| parent | fede37e4c650de07949f5e29e27d992d9ca55d5d (diff) | |
| parent | 36aa34a1a8c489f74a9821095d823f8060afac5f (diff) | |
| download | pleroma-b1b6a7dfa890a6ae16f49d2f91e2ebdbaecf1724.tar.gz pleroma-b1b6a7dfa890a6ae16f49d2f91e2ebdbaecf1724.zip | |
Merge branch 'deactivated-user-posts' into 'develop'
Deactivated user posts
Closes #2011
See merge request pleroma/pleroma!2845
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 |