diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-17 10:36:02 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-17 10:36:02 -0800 |
commit | 435b088f5aa5d6bc38369dd9c9d067e21e5b7de1 (patch) | |
tree | 3f64164d58791c4762c5fc5d4ca5240e0aecfebf /railties/Rakefile | |
parent | 6ff506ffbc438a92cb6d3cb4351a0a463d57424a (diff) | |
parent | fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69 (diff) | |
download | rails-435b088f5aa5d6bc38369dd9c9d067e21e5b7de1.tar.gz rails-435b088f5aa5d6bc38369dd9c9d067e21e5b7de1.tar.bz2 rails-435b088f5aa5d6bc38369dd9c9d067e21e5b7de1.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/Rakefile')
-rw-r--r-- | railties/Rakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index 1bc59ac0b0..c9541b0292 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -184,7 +184,7 @@ task :copy_html_files do end task :copy_application do - cp "helpers/application.rb", "#{PKG_DESTINATION}/app/controllers/application.rb" + cp "helpers/application_controller.rb", "#{PKG_DESTINATION}/app/controllers/application_controller.rb" cp "helpers/application_helper.rb", "#{PKG_DESTINATION}/app/helpers/application_helper.rb" end |