aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/date_time/zones.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-07-03 12:46:38 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2010-07-03 12:46:38 -0700
commit070c24232f74c75b60757ff2bd3cc00ea662d5a6 (patch)
tree7d5c5c3635571fcfd06144f2dff7057e470105b3 /activesupport/lib/active_support/core_ext/date_time/zones.rb
parent54250a5bfe6992afaaca6357d3b414e6c49651ba (diff)
parent075f8b72418f2d2ce9c2038bd57139955f6e46ec (diff)
downloadrails-070c24232f74c75b60757ff2bd3cc00ea662d5a6.tar.gz
rails-070c24232f74c75b60757ff2bd3cc00ea662d5a6.tar.bz2
rails-070c24232f74c75b60757ff2bd3cc00ea662d5a6.zip
Merge remote branch 'spastorino/master'
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date_time/zones.rb')
-rw-r--r--activesupport/lib/active_support/core_ext/date_time/zones.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/zones.rb b/activesupport/lib/active_support/core_ext/date_time/zones.rb
index 6002d4ad2a..a7411d54ae 100644
--- a/activesupport/lib/active_support/core_ext/date_time/zones.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/zones.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/time/zones'
+
class DateTime
# Returns the simultaneous time in <tt>Time.zone</tt>.
#