aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-10 14:38:23 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-10 14:38:23 -0300
commit4b57bc0c2aaaadfc72f8714b8cd2c88d7e9a7587 (patch)
tree884886bf2f48e43053f45ec54c32fb8c0240820d /actionmailer
parent9a43816928f07c4ed988fb47545d219eff55e28a (diff)
parent582b44175b627e3578fe71e1d452c429022da636 (diff)
downloadrails-4b57bc0c2aaaadfc72f8714b8cd2c88d7e9a7587.tar.gz
rails-4b57bc0c2aaaadfc72f8714b8cd2c88d7e9a7587.tar.bz2
rails-4b57bc0c2aaaadfc72f8714b8cd2c88d7e9a7587.zip
Merge pull request #10534 from cmaruz/master
Escape of U+2028 and U+2029 in the JSON Encoder Conflicts: activesupport/lib/active_support/json/encoding.rb
Diffstat (limited to 'actionmailer')
0 files changed, 0 insertions, 0 deletions