aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/lib/active_resource/railtie.rb
diff options
context:
space:
mode:
authorMatt Jones <al2o3cr@gmail.com>2012-02-04 13:41:12 -0600
committerMatt Jones <al2o3cr@gmail.com>2012-02-04 13:41:12 -0600
commit7c307c2da3e0e01131a892b30c040832edbfacb5 (patch)
tree1df04792144038729266f5ca7446babe5afcac92 /activeresource/lib/active_resource/railtie.rb
parentd709b124d1815340f4a2229b05362ea37298288f (diff)
parentb09b2a8401c18d1efff21b3919ac280470a6eb8b (diff)
downloadrails-7c307c2da3e0e01131a892b30c040832edbfacb5.tar.gz
rails-7c307c2da3e0e01131a892b30c040832edbfacb5.tar.bz2
rails-7c307c2da3e0e01131a892b30c040832edbfacb5.zip
Merge remote-tracking branch 'odorcicd/fix_activeresource_json_errors' into compatible_json_errors
Diffstat (limited to 'activeresource/lib/active_resource/railtie.rb')
0 files changed, 0 insertions, 0 deletions