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

This commit is contained in:
Raphael 2010-10-22 11:02:25 -07:00
commit cb02839e7e

View file

@ -1 +1,2 @@
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?