diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-14 11:37:06 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-14 11:37:06 -0800 |
| commit | bc1538e9951847dd4d1d7e37816d91b791862a0c (patch) | |
| tree | 7b4e1831f03c353a02c206a205f8786fe721f5ab /activesupport/lib/active_support/json | |
| parent | 74e1ff9dc2ebd86c783a274710e2f762059e818b (diff) | |
| download | rails-bc1538e9951847dd4d1d7e37816d91b791862a0c.tar.gz rails-bc1538e9951847dd4d1d7e37816d91b791862a0c.tar.bz2 rails-bc1538e9951847dd4d1d7e37816d91b791862a0c.zip | |
Repair time dependencies
Diffstat (limited to 'activesupport/lib/active_support/json')
| -rw-r--r-- | activesupport/lib/active_support/json/encoding.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index 8e8f9022c1..3c15056c41 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -6,7 +6,7 @@ require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/object/instance_variables' require 'active_support/deprecation' -require 'active_support/time_with_zone' +require 'active_support/time' # Hack to load json gem first so we can overwrite its to_json. begin |