From b8445ad3b20be74b3ef46edf85fb0c0635225182 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 30 Dec 2011 22:32:55 +0000
Subject: [PATCH 1/1] Serve the favicon through the assets pipeline

---
 {public => app/assets/images}/favicon.ico | Bin
 app/views/layouts/_head.html.erb          |   1 +
 2 files changed, 1 insertion(+)
 rename {public => app/assets/images}/favicon.ico (100%)

diff --git a/public/favicon.ico b/app/assets/images/favicon.ico
similarity index 100%
rename from public/favicon.ico
rename to app/assets/images/favicon.ico
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index e315ef373..3ddb73551 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -8,6 +8,7 @@
   <%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen and (min-width: 642px)" %>
   <%= stylesheet_link_tag "print-#{t 'html.dir'}", :media => "print" %>
   <!--[if IE]><%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
+  <%= favicon_link_tag "favicon.ico" %>
   <%= tag("link", { :rel => "publisher", :href => "https://plus.google.com/111953119785824514010" }) %>
   <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %>
   <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
-- 
2.43.2