diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-20 18:32:35 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-20 18:32:35 -0800 |
| commit | 91ce8d8b7f4e7ab93dda159595debadd4f659ab9 (patch) | |
| tree | 88e7592f0191eec5a66cdf45375b114d01018fcc /activesupport | |
| parent | cf9d6a95e805bdddfa9c6b541631d51b3165bf23 (diff) | |
| parent | 29c8a43056f40759a8c64cbcbd4e71d4283b233d (diff) | |
| download | rails-91ce8d8b7f4e7ab93dda159595debadd4f659ab9.tar.gz rails-91ce8d8b7f4e7ab93dda159595debadd4f659ab9.tar.bz2 rails-91ce8d8b7f4e7ab93dda159595debadd4f659ab9.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index 4f4492f0fd..703b89ffd0 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -1,4 +1,5 @@ require 'active_support/duration' +require 'active_support/core_ext/date/acts_like' require 'active_support/core_ext/date/calculations' class Time |