aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-04-08 10:25:13 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2010-04-08 10:25:13 -0700
commitab5aa55cb86424286f65b273105a3602bbd77258 (patch)
tree1238e882b8989795329ce201779b15776d06daf4 /actionpack/CHANGELOG
parent3957d44fd10c683518562f22d8b73f1b1c3d455d (diff)
parent2c27e3d336df0600581c01b794d90cd09efd6b09 (diff)
downloadrails-ab5aa55cb86424286f65b273105a3602bbd77258.tar.gz
rails-ab5aa55cb86424286f65b273105a3602bbd77258.tar.bz2
rails-ab5aa55cb86424286f65b273105a3602bbd77258.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r--actionpack/CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 84481d0194..3c765933ef 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*Rails 3.0.0 [Edge] (pending)*
+* New helpers #favicon_link_tag and #apple_touch_icon_link_tag [fxn]
+
* Added all the new HTML5 form types as individual form tag methods (search, url, number, etc) #3646 [Stephen Celis]
* Changed the object used in routing constraints to be an instance of