diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-04-19 09:42:11 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-04-19 09:42:11 -0500 |
| commit | 011afb70e51c063de7685196bcace55ddf0dc67b (patch) | |
| tree | 18e802e29d90edc0efe0e8178e0e6b8f7df34631 /actionpack/lib/action_controller/metal/renderers.rb | |
| parent | 069e9b004f91c4ace1373ab5203bb00ab41bd1f9 (diff) | |
| parent | b24621809ebd4c69796b5ca6b41e7720bc52228a (diff) | |
| download | rails-011afb70e51c063de7685196bcace55ddf0dc67b.tar.gz rails-011afb70e51c063de7685196bcace55ddf0dc67b.tar.bz2 rails-011afb70e51c063de7685196bcace55ddf0dc67b.zip | |
Merge branch 'multi_json' of https://github.com/joshk/rails into joshk-multi_json
Diffstat (limited to 'actionpack/lib/action_controller/metal/renderers.rb')
0 files changed, 0 insertions, 0 deletions