diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-30 14:19:34 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-30 14:19:34 -0700 |
| commit | e83989b5a79c264966ce07e5f4a1e160399505f6 (patch) | |
| tree | 8d63b6b65628271bfb3acafb7f0847bf60c79e70 /railties/lib/rails | |
| parent | 1d75efed8400cb28a7c56e6625be7df31e926c5a (diff) | |
| parent | 8c36eade647357de0acfa1371c4c2e28334ed81d (diff) | |
| download | rails-e83989b5a79c264966ce07e5f4a1e160399505f6.tar.gz rails-e83989b5a79c264966ce07e5f4a1e160399505f6.tar.bz2 rails-e83989b5a79c264966ce07e5f4a1e160399505f6.zip | |
Merge branch 'master' of github.com:rails/rails
* 'master' of github.com:rails/rails:
Fix release instructions
Raise an error when AS::JSON.decode is called with options
Moved all JSON core extensions into core_ext/object/json
Diffstat (limited to 'railties/lib/rails')
0 files changed, 0 insertions, 0 deletions