diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-01-26 15:38:49 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-01-26 15:38:49 -0800 |
| commit | aef76d1e7120a16e0cace1ca89c327c70cbaddf3 (patch) | |
| tree | f08da969bc8289aed4d0d9ed0c95c637d6ae8f74 /actionpack/lib/action_view | |
| parent | 458b6a7fc905a23643fc0d26146e6bf230c9c472 (diff) | |
| parent | 3c6891593d84b83c70441b4c953080481bdcc4bf (diff) | |
| download | rails-aef76d1e7120a16e0cace1ca89c327c70cbaddf3.tar.gz rails-aef76d1e7120a16e0cace1ca89c327c70cbaddf3.tar.bz2 rails-aef76d1e7120a16e0cace1ca89c327c70cbaddf3.zip | |
Merge remote branch 'fxn/master'
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/prototype_helper.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index ff7bc3b34e..bef93dd0f8 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -1,6 +1,5 @@ require 'set' require 'active_support/json' -require 'active_support/core_ext/object/extending' require 'active_support/core_ext/object/returning' module ActionView |