From aaa2999ee1e09f9b5d367f91e122dc33c74d5e87 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Thu, 19 Dec 2013 11:58:21 +1100 Subject: [PATCH] Dropping our override of ActionMailer --- config/initializers/spree.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb index bd106caf5a..9a93593f45 100644 --- a/config/initializers/spree.rb +++ b/config/initializers/spree.rb @@ -22,6 +22,7 @@ Spree.config do |config| # -- spree_paypal_express # Auto-capture payments. Without this option, payments must be manually captured in the paypal interface. config.auto_capture = true + config.override_actionmailer_config = false end