diff options
| author | Bryan Woods <bryanwoods4e@gmail.com> | 2010-06-16 15:53:20 -0400 |
|---|---|---|
| committer | Bryan Woods <bryanwoods4e@gmail.com> | 2010-06-16 15:53:20 -0400 |
| commit | 5861fde01fbe9446666b319dfc8d24514aafda21 (patch) | |
| tree | 4c78ceda7ec49a54b1c2454217e85d36d1a937aa /activerecord/lib/active_record/associations/association_proxy.rb | |
| parent | c1ff781001af157c0d5ea5ac64e1fa17d47fe1f1 (diff) | |
| parent | 35e3f72af29a33189a46a4b5ada84768b87e0ef2 (diff) | |
| download | rails-5861fde01fbe9446666b319dfc8d24514aafda21.tar.gz rails-5861fde01fbe9446666b319dfc8d24514aafda21.tar.bz2 rails-5861fde01fbe9446666b319dfc8d24514aafda21.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'activerecord/lib/active_record/associations/association_proxy.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_proxy.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/association_proxy.rb b/activerecord/lib/active_record/associations/association_proxy.rb index e88618d278..f333f4d603 100644 --- a/activerecord/lib/active_record/associations/association_proxy.rb +++ b/activerecord/lib/active_record/associations/association_proxy.rb @@ -2,6 +2,8 @@ require 'active_support/core_ext/array/wrap' module ActiveRecord module Associations + # = Active Record Associations + # # This is the root class of all association proxies: # # AssociationProxy |