Merge branch 'master' of https://github.com/andreassteph/fetsite

2013-07-22 15:49:49 +02:00
parent cc002d4291 70be1adfea
commit 4d5f665339
2 changed files with 2 additions and 2 deletions
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -15,7 +15,7 @@ Fetsite::Application.configure do

  # Don't care if the mailer can't send
  config.action_mailer.raise_delivery_errors = false
-config.action_mailer.default_url_options = { :host => 'glonass.htu.tuwien.ac.at' }
+config.action_mailer.default_url_options = {} #  :host => 'glonass.htu.tuwien.ac.at' }
  # Print deprecation notices to the Rails logger
  config.active_support.deprecation = :log