aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo Liss <joliss42@gmail.com>2012-09-21 17:07:13 +0200
committerJo Liss <joliss42@gmail.com>2012-09-21 17:08:00 +0200
commit3f9c1a1105d9abcf5aac1e50668b5acb0d612acb (patch)
tree2726efb4050e313a22ac38f76969c34d1a901456
parent84c9491eab5b9f7c4250ca4c2ca5d763e8c4ff4d (diff)
downloadrails-3f9c1a1105d9abcf5aac1e50668b5acb0d612acb.tar.gz
rails-3f9c1a1105d9abcf5aac1e50668b5acb0d612acb.tar.bz2
rails-3f9c1a1105d9abcf5aac1e50668b5acb0d612acb.zip
Revert "Fix MIME type in CHANGELOG"
CHANGELOG edits do not belongs on docrails, so I'll send a pull request instead. Thanks @rafaelfranca for catching this. This reverts commit 84c9491eab5b9f7c4250ca4c2ca5d763e8c4ff4d.
-rw-r--r--actionpack/CHANGELOG.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 8a8f83c722..8c7089cf57 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -285,7 +285,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 text/javascript instead of application/json. *omjokine*
+* JSONP now uses mimetype application/javascript instead of application/json. *omjokine*
* Allow to lazy load `default_form_builder` by passing a `String` instead of a constant. *Piotr Sarnacki*