aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/json.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-12-28 10:10:36 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-12-28 10:10:36 -0800
commitdf3701872d6c97ff49943aea30761b47e60fa9fe (patch)
tree5bb75a7433cd34d35ce1e81392970052abec3f01 /activesupport/lib/active_support/json.rb
parenta0fd9fb01730af12d66a27b5665cc010bd3b90b4 (diff)
parentf7b1906ed784940bda6f0c5173036de276867c1c (diff)
downloadrails-df3701872d6c97ff49943aea30761b47e60fa9fe.tar.gz
rails-df3701872d6c97ff49943aea30761b47e60fa9fe.tar.bz2
rails-df3701872d6c97ff49943aea30761b47e60fa9fe.zip
Merge pull request #4196 from gazay/3-2-stable-marshalling
3.2 stable marshalling
Diffstat (limited to 'activesupport/lib/active_support/json.rb')
0 files changed, 0 insertions, 0 deletions