Permalink
Browse files

Merge remote-tracking branch 'origin/DeliveryMethod' into DeliveryMethod

Conflicts:
	lib/lotus/mailer.rb
  • Loading branch information...
inescoelho committed Aug 24, 2015
2 parents 24de222 + dcd68c6 commit 65b05f0cf6586e3c65c224cd765d594512ff25c6
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/lotus/mailer.rb
View
@@ -4,6 +4,7 @@
require 'lotus/mailer/configuration'
require 'lotus/mailer/dsl'
require 'lotus/mailer/rendering'
require 'mail'
module Lotus
module Mailer
@@ -93,6 +94,5 @@ def self.load!
def self.reset!
configuration.reset!
end
end
end

0 comments on commit 65b05f0

Please sign in to comment.