Skip to content
Snippets Groups Projects
Commit cb02839e authored by Raphael's avatar Raphael
Browse files

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

parents b404346c 47b03c45
No related branches found
No related tags found
No related merge requests found
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?
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment