Merge branch 'master' of github.com:diaspora/diaspora

cb02839e · Raphael · b404346c · 47b03c45 · cb02839e
--- a/config/initializers/setup_mail.rb
+++ b/config/initializers/setup_mail.rb
-ActionMailer::Base.register_interceptor(DevelopmentMailInterceptor) if Rails.env.development?  
+# if you wish to intercept emails to go to a particuar email address
+#ActionMailer::Base.register_interceptor(DevelopmentMailInterceptor) if Rails.env.development?