From 41e7c68d87903d0596228b6c1ae2c5d87b209280 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 28 Mar 2010 22:51:48 -0700 Subject: Ruby 1.9.2: marshaling round-trips Time#zone --- activesupport/lib/active_support/time.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport/lib/active_support/time.rb') diff --git a/activesupport/lib/active_support/time.rb b/activesupport/lib/active_support/time.rb index 0f421421d0..784c7173a9 100644 --- a/activesupport/lib/active_support/time.rb +++ b/activesupport/lib/active_support/time.rb @@ -14,7 +14,7 @@ require 'date' require 'time' require 'active_support/core_ext/time/publicize_conversion_methods' -require 'active_support/core_ext/time/marshal_with_utc_flag' +require 'active_support/core_ext/time/marshal' require 'active_support/core_ext/time/acts_like' require 'active_support/core_ext/time/calculations' require 'active_support/core_ext/time/conversions' -- cgit v1.2.3