aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-12-09 17:42:52 +0000
committerLouise Crow <louise.crow@gmail.com>2013-12-09 17:42:52 +0000
commit94f9d8c3162389095269fe9cb655ba55415d201e (patch)
tree8c49c49b2c85990e280dd45bfb093f04f8461314
parent9eeed82744148cf5f889c8e584f541eb675bc05f (diff)
parent06c9c6b9a1d548a6022f145f2f75cfd88d2122c3 (diff)
Merge branch 'feature/add-favicon-link' into rails-3-develop
-rw-r--r--app/views/layouts/_favicon.html.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/_favicon.html.erb b/app/views/layouts/_favicon.html.erb
index 4f3859d6c..0ee7d48e3 100644
--- a/app/views/layouts/_favicon.html.erb
+++ b/app/views/layouts/_favicon.html.erb
@@ -1 +1 @@
-<link rel="shortcut icon" href="/favicon.ico">
+<%= favicon_link_tag 'favicon.ico' %>