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/helpers | |
| 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/helpers')
| -rw-r--r-- | railties/helpers/application_controller.rb (renamed from railties/helpers/application.rb) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/railties/helpers/application.rb b/railties/helpers/application_controller.rb index 0a3ed822a4..0a3ed822a4 100644 --- a/railties/helpers/application.rb +++ b/railties/helpers/application_controller.rb |