aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/subscriber.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-10 14:40:35 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-10 14:40:35 -0300
commite4ec944eacbb58ed682614cb3271dc58e4d71b52 (patch)
tree44cf76e435636bc907934133c07ee89056eafb92 /activesupport/lib/active_support/subscriber.rb
parent1f11dbf0b4dacede0da1be1a0675e501d1b0fced (diff)
parent9d6a5b44320bb4655cf7b633668fed1ab8ddcac2 (diff)
downloadrails-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 'activesupport/lib/active_support/subscriber.rb')
0 files changed, 0 insertions, 0 deletions