Merge branch 'master' of github.com:diaspora/diaspora
This commit is contained in:
commit
cb02839e7e
1 changed files with 2 additions and 1 deletions
|
|
@ -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?
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue