diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-03-05 22:58:48 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-05 22:58:48 +0000 |
| commit | 28ed10d3f27e27ed105dd8fd60d6151a6b372375 (patch) | |
| tree | ca2cfb5696cbc9de3d636212374eaeafafa23c39 /RAILS_VERSION | |
| parent | b7f1b3641afe0ff4f3cd344815c6f7bb58821e9e (diff) | |
| parent | 74818a35432b40fef16fe74f248ea75d35405324 (diff) | |
| download | rails-28ed10d3f27e27ed105dd8fd60d6151a6b372375.tar.gz rails-28ed10d3f27e27ed105dd8fd60d6151a6b372375.tar.bz2 rails-28ed10d3f27e27ed105dd8fd60d6151a6b372375.zip | |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/CHANGELOG
Diffstat (limited to 'RAILS_VERSION')
0 files changed, 0 insertions, 0 deletions