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

This commit is contained in:
maxwell
2010-06-22 10:32:13 -07:00

View File

@@ -16,8 +16,6 @@ Diaspora::Application.configure do
# Don't care if the mailer can't send
config.action_mailer.raise_delivery_errors = false
#oiy
#config.threadsafe!
end