mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
This reverts commit 2b82708b0e.
[#3128 state:resolved]
Conflicts:
activerecord/lib/active_record/associations.rb
activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb