##// END OF EJS Templates
Merged r13784 (#14699)....
Jean-Philippe Lang -
r13416:60d9dba5af19
parent child
Show More
@@ -370,7 +370,7 class Mailer < ActionMailer::Base
370 end
370 end
371
371
372 def mail(headers={}, &block)
372 def mail(headers={}, &block)
373 headers.merge! 'X-Mailer' => 'Redmine',
373 headers.reverse_merge! 'X-Mailer' => 'Redmine',
374 'X-Redmine-Host' => Setting.host_name,
374 'X-Redmine-Host' => Setting.host_name,
375 'X-Redmine-Site' => Setting.app_title,
375 'X-Redmine-Site' => Setting.app_title,
376 'X-Auto-Response-Suppress' => 'OOF',
376 'X-Auto-Response-Suppress' => 'OOF',
General Comments 0
You need to be logged in to leave comments. Login now