diff options
| author | José Valim <jose.valim@gmail.com> | 2009-11-11 08:16:25 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-11-11 08:16:25 -0200 |
| commit | 01ae99c681d31803f3a29f8305c9a041aa456660 (patch) | |
| tree | 7fdb9e32b743aeb254854371349cecfd2499defa /activesupport/lib/active_support/json/encoding.rb | |
| parent | d002826e54415a340e55fdbf363d005faebf8fc5 (diff) | |
| parent | fca32eb6c5b41e4f19a25b7b246c4a8a3d763667 (diff) | |
| download | rails-01ae99c681d31803f3a29f8305c9a041aa456660.tar.gz rails-01ae99c681d31803f3a29f8305c9a041aa456660.tar.bz2 rails-01ae99c681d31803f3a29f8305c9a041aa456660.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 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index f440d6ce58..8e8f9022c1 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -6,10 +6,7 @@ require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/object/instance_variables' require 'active_support/deprecation' -require 'active_support/core_ext/date_time/conversions' -require 'active_support/core_ext/time/conversions' require 'active_support/time_with_zone' -require 'active_support/values/time_zone' # Hack to load json gem first so we can overwrite its to_json. begin |