diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-06-18 10:11:47 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-06-18 10:11:47 +0200 |
| commit | 146ec2d1df81b19ed5f36b9572ad70a5814fa49d (patch) | |
| tree | ef2d9d54b0ba6f2c7f5bc46c982dcbedad38ca54 /activesupport/lib | |
| parent | 08983fefd547142ef8b913af1859b96597753d9f (diff) | |
| parent | 0fd52bb6c79f20b8dbd5c8afb774ef1dae155fc4 (diff) | |
| download | rails-146ec2d1df81b19ed5f36b9572ad70a5814fa49d.tar.gz rails-146ec2d1df81b19ed5f36b9572ad70a5814fa49d.tar.bz2 rails-146ec2d1df81b19ed5f36b9572ad70a5814fa49d.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash/indifferent_access.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb index c2a6476604..0b368fe7b7 100644 --- a/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb +++ b/activesupport/lib/active_support/core_ext/hash/indifferent_access.rb @@ -11,7 +11,7 @@ class Hash end # Called when object is nested under an object that receives - # #with_indifferent_access. This method with be called on the current object + # #with_indifferent_access. This method will be called on the current object # by the enclosing object and is aliased to #with_indifferent_access by # default. Subclasses of Hash may overwrite this method to return +self+ if # converting to an +ActiveSupport::HashWithIndifferentAccess+ would not be |