diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-10-31 10:04:56 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-10-31 10:04:56 +0000 |
| commit | d010fb13ef622bdb781e3134005fc849db4c9bea (patch) | |
| tree | 8ca8beb957fb51923938c4e7befa35d44e711dba /railties/lib/rails/tasks | |
| parent | fc276e5635821e65c04b8961170cc6bd3c11b923 (diff) | |
| parent | 3cf85fb4fcdae65a4d5a1a5c418492ea0cf9ad6d (diff) | |
| download | rails-d010fb13ef622bdb781e3134005fc849db4c9bea.tar.gz rails-d010fb13ef622bdb781e3134005fc849db4c9bea.tar.bz2 rails-d010fb13ef622bdb781e3134005fc849db4c9bea.zip | |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/lib/active_record/associations/has_many_association.rb
activerecord/lib/active_record/associations/through_association_scope.rb
Diffstat (limited to 'railties/lib/rails/tasks')
0 files changed, 0 insertions, 0 deletions