Merge /home/andis/fetsite

2015-09-14 12:06:15 +02:00
parent 7c6e04ca2e 1d8bae3aee
commit f052940d6c
108 changed files with 4419 additions and 546 deletions
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -16,7 +16,7 @@ Fetsite::Application.configure do
  # Don't care if the mailer can't send
  config.action_mailer.raise_delivery_errors = true
  config.action_mailer.delivery_method =:sendmail
-  config.action_mailer.default_url_options = {}#{:host=> "localhost", :port=>3000} #  :host => 'glonass.htu.tuwien.ac.at' }
+  config.action_mailer.default_url_options = {:host=> "localhost", :port=>3000} #  :host => 'glonass.htu.tuwien.ac.at' }
  # Print deprecation notices to the Rails logger
  config.active_support.deprecation = :log