diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2014-02-25 22:21:56 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2014-02-25 22:21:56 +0000 |
| commit | 90ba6a762c4576c6b7c83fc8a2c8c3038aeaa274 (patch) | |
| tree | b82458f3ba4004a28f9bd34f337c094c9fa16e4b /activerecord/test/cases/json_serialization_test.rb | |
| parent | 6e94140300c7f8e84f2e5b8086fc9517906197e1 (diff) | |
| parent | 41554319f8454f667b5e315339d3e286dbf6e1a4 (diff) | |
| download | rails-90ba6a762c4576c6b7c83fc8a2c8c3038aeaa274.tar.gz rails-90ba6a762c4576c6b7c83fc8a2c8c3038aeaa274.tar.bz2 rails-90ba6a762c4576c6b7c83fc8a2c8c3038aeaa274.zip | |
Merge remote-tracking branch 'chancancode/fix_instance_method_already_implemented'
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test/cases/json_serialization_test.rb')
0 files changed, 0 insertions, 0 deletions