diff options
author | Jon Leighton <j@jonathanleighton.com> | 2011-03-16 18:54:51 +0000 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-16 18:54:51 +0000 |
commit | 8aaf3c1e553d18b40d9980951d496bffad56f37b (patch) | |
tree | 2eddd2b50a5924420b30caa5c6d867f4870a71dc /Rakefile | |
parent | 9abc94c44516afdcfe4a3b202c336c9578fd6d0d (diff) | |
parent | 0eae62525696b57fe7fc4bbb0bf9c0bc7ee4e480 (diff) | |
download | rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.tar.gz rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.tar.bz2 rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.zip |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'Rakefile')
-rwxr-xr-x | Rakefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -85,6 +85,7 @@ RDoc::Task.new do |rdoc| rdoc.rdoc_files.include('actionmailer/README.rdoc') rdoc.rdoc_files.include('actionmailer/CHANGELOG') rdoc.rdoc_files.include('actionmailer/lib/action_mailer/base.rb') + rdoc.rdoc_files.include('actionmailer/lib/action_mailer/mail_helper.rb') rdoc.rdoc_files.exclude('actionmailer/lib/action_mailer/vendor/*') rdoc.rdoc_files.include('activesupport/README.rdoc') |