hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Egor Kislitsyn 2019-12-16 22:34:21 +07:00
commit b9a87b1baa
No known key found for this signature in database
GPG key ID: 1B49CB15B71E7805
3 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/test.exs
View file

@ -97,8 +97,6 @@ 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