diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-14 21:44:10 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-14 21:44:10 +0300 |
| commit | 67cb46e15dd5fa16da257a9b0e5166266d10c694 (patch) | |
| tree | 6801ecba06ea3aac7086c57834e1413e5bb0c84a /config/test.exs | |
| parent | 2b821036c4bd84cee51c9fcace5a4b3764c3bba1 (diff) | |
| parent | 8efacfed677ea2f06ac228294faec77a38060976 (diff) | |
| download | pleroma-67cb46e15dd5fa16da257a9b0e5166266d10c694.tar.gz pleroma-67cb46e15dd5fa16da257a9b0e5166266d10c694.zip | |
Merge branch 'develop' into issue/1383
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 fff709d65..c204bf37f 100644 --- a/config/test.exs +++ b/config/test.exs @@ -91,6 +91,8 @@ config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp3 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock +config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |