diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-06-06 22:23:30 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-06-06 22:23:30 +0200 |
| commit | 5e21247131fa7d5484190c9a71b74f9d3f090684 (patch) | |
| tree | 5eee39fcabb952cafd513caf7e67943bc6b26e98 /activeresource/lib/active_resource/formats.rb | |
| parent | 38ad6bb2f566202dd522a0cf31a55a746f122d53 (diff) | |
| parent | 689e12b828665b7b2cfcda85d46249c5cf2aa713 (diff) | |
| download | rails-5e21247131fa7d5484190c9a71b74f9d3f090684.tar.gz rails-5e21247131fa7d5484190c9a71b74f9d3f090684.tar.bz2 rails-5e21247131fa7d5484190c9a71b74f9d3f090684.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
activerecord/RUNNING_UNIT_TESTS
Diffstat (limited to 'activeresource/lib/active_resource/formats.rb')
0 files changed, 0 insertions, 0 deletions