aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2013-02-21 15:34:02 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2013-02-21 15:34:02 -0200
commit389397952460d09218bb407be1142e0b62cf3f4f (patch)
tree6247bebf882c76388d6a654cc3cb74629bf11d40 /actionpack/CHANGELOG.md
parentc60be72c5243c21303b067c9c5cc398111cf48c8 (diff)
downloadrails-389397952460d09218bb407be1142e0b62cf3f4f.tar.gz
rails-389397952460d09218bb407be1142e0b62cf3f4f.tar.bz2
rails-389397952460d09218bb407be1142e0b62cf3f4f.zip
Revert "Revert "Merge pull request #4803 from lucascaton/master""
This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d.
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 94eb876db5..bf3c81740f 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -996,6 +996,8 @@
not submitted with the form. This is a behavior change, previously the hidden
tag had a value of the disabled checkbox. *Tadas Tamosauskas*
+* `favicon_link_tag` helper will now use the favicon in app/assets by default. *Lucas Caton*
+
* `ActionView::Helpers::TextHelper#highlight` now defaults to the
HTML5 `mark` element. *Brian Cardarella*