aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/json/encoding_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-05 17:48:54 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-05 17:48:54 -0200
commit459a9ea47fdcdb16dbcf6bd98e54a2fda5a16e39 (patch)
tree59e5abf1d9e946efaada9a27a9cc600361e211e4 /activesupport/test/json/encoding_test.rb
parent9ec973f0ac5148998278b2f435b53d0536ceff63 (diff)
parent0928c3f2945339437eda2d555d2846b02f06950f (diff)
downloadrails-459a9ea47fdcdb16dbcf6bd98e54a2fda5a16e39.tar.gz
rails-459a9ea47fdcdb16dbcf6bd98e54a2fda5a16e39.tar.bz2
rails-459a9ea47fdcdb16dbcf6bd98e54a2fda5a16e39.zip
Merge pull request #18747 from vipulnsward/merge-skip-callback
Rename AS::Callback#merge
Diffstat (limited to 'activesupport/test/json/encoding_test.rb')
0 files changed, 0 insertions, 0 deletions