nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2016-06-07 13:11:52 +02:00
commit 9346fadefc
No known key found for this signature in database
GPG key ID: F347E0EB47AC70D6
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/initializers/mailer_config.rb
View file

@ -29,7 +29,8 @@ Diaspora::Application.configure do
port: AppConfig.mail.smtp.port.to_i,
domain: AppConfig.mail.smtp.domain.get,
enable_starttls_auto: false,
openssl_verify_mode: AppConfig.mail.smtp.openssl_verify_mode.get
openssl_verify_mode: AppConfig.mail.smtp.openssl_verify_mode.get,
ca_file: AppConfig.environment.certificate_authorities.get
}
if AppConfig.mail.smtp.authentication != "none"