diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2016-05-14 09:54:23 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2016-05-14 09:54:23 +0000 |
| commit | 83ecf3fe56f0c4b89cc5f2c5bdab6e0e7d26b7a1 (patch) | |
| tree | 899a536f2c978f6349a48932a2da1c0cc8b84c4a /activerecord/test/cases/json_serialization_test.rb | |
| parent | 4046ac7e88dfcd9089e602ad0d6196bc8efc46a6 (diff) | |
| parent | 26e59e686c2553035ad3f7c50089b79c93d07f38 (diff) | |
| download | rails-83ecf3fe56f0c4b89cc5f2c5bdab6e0e7d26b7a1.tar.gz rails-83ecf3fe56f0c4b89cc5f2c5bdab6e0e7d26b7a1.tar.bz2 rails-83ecf3fe56f0c4b89cc5f2c5bdab6e0e7d26b7a1.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
guides/source/configuring.md
Diffstat (limited to 'activerecord/test/cases/json_serialization_test.rb')
0 files changed, 0 insertions, 0 deletions