aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-07-31 16:35:58 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-07-31 16:35:58 -0700
commit46a458206f1117b87e672bc5aae046eaa832ee00 (patch)
treeb2692b98da56d23394605594c9dea5610719e7e0 /actionmailer
parenta540725f0d3439ea3b0f938d04ceed87d3690d9d (diff)
parent0b9bfbdebf402f4a149359a069dbeb05ea989b14 (diff)
downloadrails-46a458206f1117b87e672bc5aae046eaa832ee00.tar.gz
rails-46a458206f1117b87e672bc5aae046eaa832ee00.tar.bz2
rails-46a458206f1117b87e672bc5aae046eaa832ee00.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionmailer')
-rw-r--r--[-rwxr-xr-x]actionmailer/README0
-rw-r--r--[-rwxr-xr-x]actionmailer/Rakefile0
-rw-r--r--[-rwxr-xr-x]actionmailer/lib/action_mailer.rb0
-rw-r--r--[-rwxr-xr-x]actionmailer/test/mail_service_test.rb0
4 files changed, 0 insertions, 0 deletions
diff --git a/actionmailer/README b/actionmailer/README
index 0e16ea6ec6..0e16ea6ec6 100755..100644
--- a/actionmailer/README
+++ b/actionmailer/README
diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index 612bd27774..612bd27774 100755..100644
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 2e324d4637..2e324d4637 100755..100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index e5ecb0e254..e5ecb0e254 100755..100644
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb