aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/new_base.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-05-09 13:07:30 -0300
committerEmilio Tagua <miloops@gmail.com>2009-05-09 13:07:30 -0300
commit6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5 (patch)
treec169325ddd18aedd18c66f22a53ba04190a0a41e /actionpack/lib/action_controller/new_base.rb
parent8885b2d6c1855742600d0afdb9dfc002acb62e5e (diff)
parent8ee0c598dbe3f9fd133e85c69c6e43f62056646c (diff)
downloadrails-6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5.tar.gz
rails-6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5.tar.bz2
rails-6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5.zip
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/new_base.rb')
-rw-r--r--actionpack/lib/action_controller/new_base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/new_base.rb b/actionpack/lib/action_controller/new_base.rb
index 7c65f1cdc1..29dc3aaddc 100644
--- a/actionpack/lib/action_controller/new_base.rb
+++ b/actionpack/lib/action_controller/new_base.rb
@@ -4,4 +4,4 @@ module ActionController
autoload :Layouts, "action_controller/new_base/layouts"
autoload :Renderer, "action_controller/new_base/renderer"
autoload :UrlFor, "action_controller/new_base/url_for"
-end \ No newline at end of file
+end