diff options
| author | José Valim <jose.valim@gmail.com> | 2010-03-08 21:06:26 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-03-08 21:06:26 +0100 |
| commit | 7942e909608f24db0365943c5d9ad51cbb4d27b5 (patch) | |
| tree | 6a9b51155b9220dbf98d4b1c78d8edccabd231c5 /activesupport/lib/active_support/core_ext/array/conversions.rb | |
| parent | 36eb1a686c831d5a14998bb9ac7cc60efa363373 (diff) | |
| parent | ae93789d9ad9095ca21784287464b760db12a095 (diff) | |
| download | rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.tar.gz rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.tar.bz2 rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.zip | |
Merge master.
Diffstat (limited to 'activesupport/lib/active_support/core_ext/array/conversions.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/array/conversions.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb index 814567a5a6..2119322bfe 100644 --- a/activesupport/lib/active_support/core_ext/array/conversions.rb +++ b/activesupport/lib/active_support/core_ext/array/conversions.rb @@ -1,7 +1,6 @@ require 'active_support/core_ext/hash/keys' require 'active_support/core_ext/hash/reverse_merge' require 'active_support/inflector' -require 'active_support/i18n' class Array # Converts the array to a comma-separated sentence where the last element is joined by the connector word. Options: |