aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/option_merger.rb
diff options
context:
space:
mode:
authorZachary Scott <e@zzak.io>2015-06-13 10:53:57 -0400
committerZachary Scott <e@zzak.io>2015-06-13 10:53:57 -0400
commitdfc9269517d787d187ee46c798a4ea0893de0381 (patch)
tree90aa87d0f03583fd0ec7539cd243b862916ab2cf /activesupport/lib/active_support/option_merger.rb
parent2e5960490936890624cdb2e23c9da4f2b12c4fbf (diff)
parent55703f94c094fd4cc13268e3720394eb4f3cb7a5 (diff)
downloadrails-dfc9269517d787d187ee46c798a4ea0893de0381.tar.gz
rails-dfc9269517d787d187ee46c798a4ea0893de0381.tar.bz2
rails-dfc9269517d787d187ee46c798a4ea0893de0381.zip
Merge pull request #20542 from repinel/fix-bi-directional-assoc-doc
[ci skip] Fix the API docs for Bi-directional associations
Diffstat (limited to 'activesupport/lib/active_support/option_merger.rb')
0 files changed, 0 insertions, 0 deletions