From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Mon, 16 Dec 2019 15:34:21 +0000 (+0700)
Subject: Merge branch 'develop' into feature/custom-runtime-modules
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b9a87b1baa0650bfb4b699054304daae585a0e9a;p=akkoma

Merge branch 'develop' into feature/custom-runtime-modules
---

b9a87b1baa0650bfb4b699054304daae585a0e9a
diff --cc config/test.exs
index 6f6ab733e,d52ced612..5c66a36f1
--- a/config/test.exs
+++ b/config/test.exs
@@@ -95,10 -95,6 +95,8 @@@ config :joken, default_signer: "yU8uHKq
  
  config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
  
 +config :pleroma, :modules, runtime_dir: "test/fixtures/modules"
 +
- config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
- 
  if File.exists?("./config/test.secret.exs") do
    import_config "test.secret.exs"
  else