diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-10 14:40:35 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-10 14:40:35 -0300 |
| commit | e4ec944eacbb58ed682614cb3271dc58e4d71b52 (patch) | |
| tree | 44cf76e435636bc907934133c07ee89056eafb92 /activerecord/lib/active_record/sanitization.rb | |
| parent | 1f11dbf0b4dacede0da1be1a0675e501d1b0fced (diff) | |
| parent | 9d6a5b44320bb4655cf7b633668fed1ab8ddcac2 (diff) | |
| download | rails-e4ec944eacbb58ed682614cb3271dc58e4d71b52.tar.gz rails-e4ec944eacbb58ed682614cb3271dc58e4d71b52.tar.bz2 rails-e4ec944eacbb58ed682614cb3271dc58e4d71b52.zip | |
Merge branch 'fix-json-encoding'
This is the compination of #10057 and 10534.
Closes #10320
Diffstat (limited to 'activerecord/lib/active_record/sanitization.rb')
0 files changed, 0 insertions, 0 deletions