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

Merge branch 'develop' into gun

Browse source
This commit is contained in:
Alexander Strizhakov 2020-02-21 10:02:37 +03:00
commit 13918cb545
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
56 changed files with 860 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/test.exs
View file

@ -96,6 +96,8 @@ config :pleroma, :modules, runtime_dir: "test/fixtures/modules"
config :pleroma, Pleroma.Gun.API, Pleroma.Gun.API.Mock
config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: true
if File.exists?("./config/test.secret.exs") do
import_config "test.secret.exs"
else