diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-14 16:26:56 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-14 21:29:14 +0300 |
| commit | c9f45edeac2cc3ed262bb4b30dc7e1120c6fa047 (patch) | |
| tree | 3ba35681409d9c5dd9ca4d355ff39d4dd67448d4 /config/test.exs | |
| parent | 969769730e0b7578ddc6a5cd02f9b24eff5902a0 (diff) | |
| parent | 12b28c8925c2c55e0d7bb66ff3320532a1aade3b (diff) | |
| download | pleroma-c9f45edeac2cc3ed262bb4b30dc7e1120c6fa047.tar.gz pleroma-c9f45edeac2cc3ed262bb4b30dc7e1120c6fa047.zip | |
Merge branch 'develop' into feature/tag_feed
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 d52ced612..5c66a36f1 100644 --- a/config/test.exs +++ b/config/test.exs @@ -95,6 +95,8 @@ config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp3 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock +config :pleroma, :modules, runtime_dir: "test/fixtures/modules" + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |