diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-08-14 16:31:14 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-08-14 16:31:14 +0100 |
| commit | 2ebe8d275efa53af967b09ad66dab68acc1aed98 (patch) | |
| tree | b0b3e42c277b213788b55558aef3579f4e242300 /activeresource/lib/active_resource/base.rb | |
| parent | 73ef94e9675ef6db85f18f1e3c70bf6ddfc1260a (diff) | |
| parent | 8cb14ee1203c9ed380c4b192e8730757a52d43cb (diff) | |
| download | rails-2ebe8d275efa53af967b09ad66dab68acc1aed98.tar.gz rails-2ebe8d275efa53af967b09ad66dab68acc1aed98.tar.bz2 rails-2ebe8d275efa53af967b09ad66dab68acc1aed98.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/request.rb
actionpack/lib/action_controller/resources.rb
Diffstat (limited to 'activeresource/lib/active_resource/base.rb')
0 files changed, 0 insertions, 0 deletions