diff options
| author | wycats <wycats@gmail.com> | 2010-04-10 17:22:52 -0400 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-10 17:22:52 -0400 |
| commit | 87f7093ee3306f417e1136d947eba200d40ff8e7 (patch) | |
| tree | ba70dbdaf67e12fc067bb5d8343d7681932452ef /actionpack/lib/action_controller.rb | |
| parent | ee8e9d548472fb8cb8792a569e579c6513be77d6 (diff) | |
| parent | 381f877bbbbf81d679f5be3b7ac7e961d41502bd (diff) | |
| download | rails-87f7093ee3306f417e1136d947eba200d40ff8e7.tar.gz rails-87f7093ee3306f417e1136d947eba200d40ff8e7.tar.bz2 rails-87f7093ee3306f417e1136d947eba200d40ff8e7.zip | |
Merge branch 'master' into docrails_master
Diffstat (limited to 'actionpack/lib/action_controller.rb')
| -rw-r--r-- | actionpack/lib/action_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 536154fc6b..c14393dda7 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -33,7 +33,6 @@ module ActionController autoload :Streaming autoload :Testing autoload :UrlFor - autoload :Verification end autoload :Dispatcher, 'action_controller/deprecated/dispatcher' |