diff options
author | Jon Leighton <j@jonathanleighton.com> | 2011-03-04 09:33:02 +0000 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-04 20:36:11 +0000 |
commit | a5ef8b9fa0b30f73af206145cfc39228cb6b9526 (patch) | |
tree | cffdc4b83a1fabf6f27c682c1d911a9b22b8abc7 /railties/MIT-LICENSE | |
parent | 735844db712c511dd8abf36a5279318fbc0ff9d0 (diff) | |
parent | 1db4969dc9cabed9db162e7194b9353d43c967d7 (diff) | |
download | rails-a5ef8b9fa0b30f73af206145cfc39228cb6b9526.tar.gz rails-a5ef8b9fa0b30f73af206145cfc39228cb6b9526.tar.bz2 rails-a5ef8b9fa0b30f73af206145cfc39228cb6b9526.zip |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'railties/MIT-LICENSE')
0 files changed, 0 insertions, 0 deletions