merging master in.... now I am going to go back to 187

2010-06-22 10:32:13 -07:00 · 2010-06-22 10:32:13 -07:00 · cf80aa4010
commit cf80aa4010
parent 531ab3ab83 51279cd519
1 changed files with 1 additions and 3 deletions
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@ -17,7 +17,5 @@ Diaspora::Application.configure do
  # Don't care if the mailer can't send
  config.action_mailer.raise_delivery_errors = false

-  
-  #oiy
  #config.threadsafe!
 end