diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-10-28 18:06:01 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-10-28 18:06:01 +0100 |
| commit | fc276e5635821e65c04b8961170cc6bd3c11b923 (patch) | |
| tree | 9bd4ed018858611248e9b6aa7392dced92bc814a /activerecord/test/models/bird.rb | |
| parent | 8e53e058acea471eab7a1609dc150aa9fdbfa833 (diff) | |
| parent | 6a3d6b7f1352efd3e7b931533740252b04850e27 (diff) | |
| download | rails-fc276e5635821e65c04b8961170cc6bd3c11b923.tar.gz rails-fc276e5635821e65c04b8961170cc6bd3c11b923.tar.bz2 rails-fc276e5635821e65c04b8961170cc6bd3c11b923.zip | |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/CHANGELOG
activerecord/lib/active_record/association_preload.rb
activerecord/lib/active_record/associations.rb
activerecord/test/schema/schema.rb
Diffstat (limited to 'activerecord/test/models/bird.rb')
0 files changed, 0 insertions, 0 deletions