aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/rails
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-03-10 19:35:20 +0000
committerJon Leighton <j@jonathanleighton.com>2011-03-10 19:35:20 +0000
commit582edaa1ffd6d875e18c50e36e144544209fd158 (patch)
treece4fb934973e1385ec64b78df6984e4a6267fc11 /activerecord/lib/rails
parent2d3d9e3531d0d49a94ded10b993640053bd76c03 (diff)
parent51a269b2282ec09cf58614e738a2d0e40d2909d3 (diff)
downloadrails-582edaa1ffd6d875e18c50e36e144544209fd158.tar.gz
rails-582edaa1ffd6d875e18c50e36e144544209fd158.tar.bz2
rails-582edaa1ffd6d875e18c50e36e144544209fd158.zip
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'activerecord/lib/rails')
0 files changed, 0 insertions, 0 deletions