aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-04-21 12:15:39 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-04-21 12:15:39 -0700
commitc3d50b35b0e03a68095ebb0d52d371d28c8aa436 (patch)
tree9289c59ed6f0a7f85b4973841fce53d91f2b72a9 /activeresource
parentf51557deb0a591a442e94d07d90e57853693ad14 (diff)
parent5e62670131dfa1718eaf21ff8dd3371395a5f1cc (diff)
downloadrails-c3d50b35b0e03a68095ebb0d52d371d28c8aa436.tar.gz
rails-c3d50b35b0e03a68095ebb0d52d371d28c8aa436.tar.bz2
rails-c3d50b35b0e03a68095ebb0d52d371d28c8aa436.zip
Merge pull request #5896 from sferik/revert_5861
Revert #5861. Feature-detect which MultiJson API to use.
Diffstat (limited to 'activeresource')
0 files changed, 0 insertions, 0 deletions