Merge branch 'master' into features/publicity

# Conflicts: # .gitignore
2017-04-18 16:22:36 +02:00
parent 93dc7b0c50 cb1bf34588
commit 8cb8aea9ca
13 changed files with 11 additions and 81 deletions
@@ -74,8 +74,8 @@ Rails.application.configure do
  # Use default logging formatter so that PID and timestamp are not suppressed.
  config.log_formatter = ::Logger::Formatter.new

-  config.action_mailer.default_url_options = { host: 'ch420.herokuapp.com' }
-  config.action_mailer.asset_host = 'https://ch420.herokuapp.com'
+  config.action_mailer.default_url_options = { host: 'www.cannabis-initiative.ch' }
+  config.action_mailer.asset_host = 'https://www.cannabis-initiative.ch'

  config.action_mailer.delivery_method = :smtp
  config.action_mailer.smtp_settings = {