aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xactionmailer/Rakefile2
-rw-r--r--actionmailer/lib/action_mailer/version.rb (renamed from actionmailer/lib/version.rb)0
2 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index 746e15f808..5231d37c4d 100755
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -5,7 +5,7 @@ require 'rake/rdoctask'
require 'rake/packagetask'
require 'rake/gempackagetask'
require 'rake/contrib/rubyforgepublisher'
-require File.join(File.dirname(__FILE__), 'lib', 'version')
+require File.join(File.dirname(__FILE__), 'lib', 'action_mailer', 'version')
PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
PKG_NAME = 'actionmailer'
diff --git a/actionmailer/lib/version.rb b/actionmailer/lib/action_mailer/version.rb
index 557b05f14e..557b05f14e 100644
--- a/actionmailer/lib/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb