aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/json_serialization_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-07 17:33:40 +0200
committerJosé Valim <jose.valim@gmail.com>2011-05-07 17:33:40 +0200
commit5d6c8d5e9d1c6544f8db8639e3a53a8d7682eeb2 (patch)
treecfe6165eadd5b11d41d0b057618e7071847a030d /activerecord/test/cases/json_serialization_test.rb
parent00a1152fa79808dfa86a516fe150911297f7aa58 (diff)
downloadrails-5d6c8d5e9d1c6544f8db8639e3a53a8d7682eeb2.tar.gz
rails-5d6c8d5e9d1c6544f8db8639e3a53a8d7682eeb2.tar.bz2
rails-5d6c8d5e9d1c6544f8db8639e3a53a8d7682eeb2.zip
Revert "Revert the merge because tests did not pass."
This reverts commit 886818d2bab40585c0cea763002ffc16917dd0b3.
Diffstat (limited to 'activerecord/test/cases/json_serialization_test.rb')
0 files changed, 0 insertions, 0 deletions