aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-21 09:21:03 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-21 09:21:03 -0700
commitde9d1c6366023237ec93a425360b4fbe873d50a6 (patch)
treec59a63c55a8eaec77f1cf4dd3301313adb69a004 /actionpack
parent392eeecc11a291e406db927a18b75f41b2658253 (diff)
parentcf1f670846eac7405844a200bd3de85147749ab0 (diff)
downloadrails-de9d1c6366023237ec93a425360b4fbe873d50a6.tar.gz
rails-de9d1c6366023237ec93a425360b4fbe873d50a6.tar.bz2
rails-de9d1c6366023237ec93a425360b4fbe873d50a6.zip
Merge pull request #7724 from joliss/changelog
Fix MIME type in CHANGELOG [ci skip]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 9f0f214137..fcaf7b0bbc 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -348,7 +348,7 @@
* Make current object and counter (when it applies) variables accessible when
rendering templates with :object / :collection. *Carlos Antonio da Silva*
-* JSONP now uses mimetype application/javascript instead of application/json. *omjokine*
+* JSONP now uses mimetype text/javascript instead of application/json. *omjokine*
* Allow to lazy load `default_form_builder` by passing a `String` instead of a constant. *Piotr Sarnacki*