diff options
| author | Neeraj Singh <neerajdotname@gmail.com> | 2010-06-15 00:46:44 -0400 |
|---|---|---|
| committer | Neeraj Singh <neerajdotname@gmail.com> | 2010-06-15 00:46:44 -0400 |
| commit | 5e60e6571384a809598f3118fdc02dac1fd9d7b8 (patch) | |
| tree | 3cfccbc36f0133124181ab965480a1352d86ca79 /actionpack/lib/action_controller.rb | |
| parent | 51a9703b1e80caa30d699f30615f023079874623 (diff) | |
| parent | 1a50cc31639f35fd82a4a24821b9fc49dc7eadc9 (diff) | |
| download | rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.tar.gz rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.tar.bz2 rails-5e60e6571384a809598f3118fdc02dac1fd9d7b8.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller.rb')
| -rw-r--r-- | actionpack/lib/action_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index c14393dda7..1bd4572a47 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -67,7 +67,7 @@ end require 'action_view' require 'action_controller/vendor/html-scanner' -# Common ActiveSupport usage in ActionController +# Common Active Support usage in Action Controller require 'active_support/concern' require 'active_support/core_ext/class/attribute_accessors' require 'active_support/core_ext/load_error' |