diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-04-28 12:10:57 -0700 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-04-28 12:10:57 -0700 |
| commit | 86559bebf29fb0ccbde642dcc12925a7037b1551 (patch) | |
| tree | 1fc020d7aa747db31fbd8c71f632b5888b2104df | |
| parent | 434be0fd69a58cc744cd48c0d69440df1102b157 (diff) | |
| parent | 61d84e0e81b0ae65952d2e02fe97c50c122b943f (diff) | |
| download | rails-86559bebf29fb0ccbde642dcc12925a7037b1551.tar.gz rails-86559bebf29fb0ccbde642dcc12925a7037b1551.tar.bz2 rails-86559bebf29fb0ccbde642dcc12925a7037b1551.zip | |
Merge pull request #6038 from arunagw/warning_removed_3-2-stable
Warning removed 3 2 stable
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index 69b98d24d3..d845cd1c77 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -1,5 +1,4 @@ require 'active_support/duration' -require 'active_support/core_ext/time/zones' require 'active_support/core_ext/time/conversions' class Time |