diff options
| author | Emilio Tagua <miloops@gmail.com> | 2011-02-18 15:29:33 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2011-02-18 15:29:33 -0300 |
| commit | 0b702ba3de42ed2ae8855843127f898102802b77 (patch) | |
| tree | fc7d9b2fd78c3558dd978f3b67e5e58792551668 /activerecord/lib/active_record/associations/through_association.rb | |
| parent | 90a850aea4c2c04df22be0aaad1144468fcc8078 (diff) | |
| parent | 1644663ba7f678d178deab2bf1629dc05626f85b (diff) | |
| download | rails-0b702ba3de42ed2ae8855843127f898102802b77.tar.gz rails-0b702ba3de42ed2ae8855843127f898102802b77.tar.bz2 rails-0b702ba3de42ed2ae8855843127f898102802b77.zip | |
Merge remote branch 'rails/master' into identity_map
Conflicts:
activerecord/lib/active_record/associations/association.rb
activerecord/lib/active_record/fixtures.rb
Diffstat (limited to 'activerecord/lib/active_record/associations/through_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/through_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/through_association.rb b/activerecord/lib/active_record/associations/through_association.rb index 0550bae408..8db8068295 100644 --- a/activerecord/lib/active_record/associations/through_association.rb +++ b/activerecord/lib/active_record/associations/through_association.rb @@ -1,7 +1,7 @@ module ActiveRecord # = Active Record Through Association module Associations - module ThroughAssociation + module ThroughAssociation #:nodoc: protected |