aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/json/decoding.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-06-19 16:10:24 +0200
committerJosé Valim <jose.valim@gmail.com>2009-06-19 16:10:24 +0200
commit8037fee9ff1dd13c421e6689229457c1ef084074 (patch)
treec60b2bf3e297be3e1bccb64ffd034acb137a7aa8 /activesupport/lib/active_support/json/decoding.rb
parent908b5305d4446433433313e315deb4083c58233e (diff)
parent9f7eaea201b2f408d9effbf82f2731957e284adf (diff)
downloadrails-8037fee9ff1dd13c421e6689229457c1ef084074.tar.gz
rails-8037fee9ff1dd13c421e6689229457c1ef084074.tar.bz2
rails-8037fee9ff1dd13c421e6689229457c1ef084074.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activesupport/lib/active_support/json/decoding.rb')
-rw-r--r--activesupport/lib/active_support/json/decoding.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/json/decoding.rb b/activesupport/lib/active_support/json/decoding.rb
index b4e4177724..356b6cebeb 100644
--- a/activesupport/lib/active_support/json/decoding.rb
+++ b/activesupport/lib/active_support/json/decoding.rb
@@ -1,4 +1,5 @@
require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/core_ext/module/delegation'
module ActiveSupport
# Look for and parse json strings that look like ISO 8601 times.