diff options
| author | José Valim <jose.valim@gmail.com> | 2009-11-23 22:04:18 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-11-23 22:04:18 -0200 |
| commit | 4ff66b6b85d1351e447f18c027f1dba6bcf23a7b (patch) | |
| tree | a46d6c65c5c67964bc8658bf991157f0f8056f55 /activesupport/lib/active_support/json/encoding.rb | |
| parent | 01ae99c681d31803f3a29f8305c9a041aa456660 (diff) | |
| parent | 934bb012ba3f1da5cd181ae5c2d84f697a3c58a1 (diff) | |
| download | rails-4ff66b6b85d1351e447f18c027f1dba6bcf23a7b.tar.gz rails-4ff66b6b85d1351e447f18c027f1dba6bcf23a7b.tar.bz2 rails-4ff66b6b85d1351e447f18c027f1dba6bcf23a7b.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activesupport/lib/active_support/json/encoding.rb')
| -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 |