diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-03-28 22:51:48 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-03-28 22:52:08 -0700 |
| commit | 41e7c68d87903d0596228b6c1ae2c5d87b209280 (patch) | |
| tree | c7cee7afcff50be6a1d1381e1b6ea0f336d784be /activesupport/lib/active_support/time.rb | |
| parent | 40d90ed7df3fbb730b5a1231445247accbf895f1 (diff) | |
| download | rails-41e7c68d87903d0596228b6c1ae2c5d87b209280.tar.gz rails-41e7c68d87903d0596228b6c1ae2c5d87b209280.tar.bz2 rails-41e7c68d87903d0596228b6c1ae2c5d87b209280.zip | |
Ruby 1.9.2: marshaling round-trips Time#zone
Diffstat (limited to 'activesupport/lib/active_support/time.rb')
| -rw-r--r-- | activesupport/lib/active_support/time.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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' |