aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-10-02 16:10:17 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-10-02 16:10:17 -0700
commit781390551b4a7a6b1c7df6486bf0019ac1eff5ba (patch)
tree71c8b527fc874cba3c0cddcfabef2f933e234688 /activerecord/lib/active_record/associations
parent244446fcc52127274d5ad38986bf585c89ba82a5 (diff)
parent6be94d29276003ee5e9ae6c4fc970010cc91388b (diff)
downloadrails-781390551b4a7a6b1c7df6486bf0019ac1eff5ba.tar.gz
rails-781390551b4a7a6b1c7df6486bf0019ac1eff5ba.tar.bz2
rails-781390551b4a7a6b1c7df6486bf0019ac1eff5ba.zip
Merge branch 'master' into habtm
* master: copy-edits the new guide with our maintenance policy [ci skip]
Diffstat (limited to 'activerecord/lib/active_record/associations')
0 files changed, 0 insertions, 0 deletions