diff options
author | Jon Leighton <j@jonathanleighton.com> | 2010-10-14 10:25:43 +0100 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2010-10-14 10:25:43 +0100 |
commit | 3fb493c2b037ffbdda5c91d66334ec6f79faa2d1 (patch) | |
tree | e49b072103bbfe6fb6159954c786a31f44099325 /RAILS_VERSION | |
parent | 212fdd8ba9624f61421a7a950283537a3d39ac18 (diff) | |
parent | 01ab6f961bff150d50c99f03fa3946f48ac29b17 (diff) | |
download | rails-3fb493c2b037ffbdda5c91d66334ec6f79faa2d1.tar.gz rails-3fb493c2b037ffbdda5c91d66334ec6f79faa2d1.tar.bz2 rails-3fb493c2b037ffbdda5c91d66334ec6f79faa2d1.zip |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/lib/active_record/associations.rb
activerecord/test/cases/associations/cascaded_eager_loading_test.rb
Diffstat (limited to 'RAILS_VERSION')
0 files changed, 0 insertions, 0 deletions