diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-01-12 12:12:15 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-01-12 12:12:15 -0600 |
| commit | 2f5b8fbeb3830759c00675f99d893a92b1d3edb2 (patch) | |
| tree | ee7ba90fa0b52e31cc7beeb9335deefbadd94e15 /config/test.exs | |
| parent | 933dc120438d14502e4bc4c29db904114fb6e438 (diff) | |
| parent | ecb8fe183c5a007e80d7b2b1bfc9ead89dc27cc2 (diff) | |
| download | pleroma-2f5b8fbeb3830759c00675f99d893a92b1d3edb2.tar.gz pleroma-2f5b8fbeb3830759c00675f99d893a92b1d3edb2.zip | |
Merge branch 'develop' into issue/1354
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 |