diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-11-08 11:02:26 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-11-08 11:02:26 +0000 |
| commit | e05162cffad7ae86615c21c6b54ab161d0261c39 (patch) | |
| tree | c02e6faf12c2ce50ef4ac40342daf488d7fa0f8d /activerecord/test/cases/json_serialization_test.rb | |
| parent | 083d6f267611472b8acfb9801e64971ee6d19994 (diff) | |
| parent | 4e0477c9b75683372f662a614ae91b158120ebe8 (diff) | |
| download | rails-e05162cffad7ae86615c21c6b54ab161d0261c39.tar.gz rails-e05162cffad7ae86615c21c6b54ab161d0261c39.tar.bz2 rails-e05162cffad7ae86615c21c6b54ab161d0261c39.zip | |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'activerecord/test/cases/json_serialization_test.rb')
0 files changed, 0 insertions, 0 deletions