Merged r3894 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3896 e93f8b46-1217-0410-a6f0-8f06a7374b81
pull/351/head
Eric Davis 14 years ago
parent 0843b188fb
commit 677fee310a
  1. 4
      app/helpers/application_helper.rb
  2. 1
      app/views/layouts/base.rhtml

@ -783,6 +783,10 @@ module ApplicationHelper
end
end
def favicon
"<link rel='shortcut icon' href='#{Redmine::Utils.relative_url_root}/favicon.ico' />"
end
private
def wiki_helper

@ -5,6 +5,7 @@
<title><%=h html_title %></title>
<meta name="description" content="<%= Redmine::Info.app_name %>" />
<meta name="keywords" content="issue,bug,tracker" />
<%= favicon %>
<%= stylesheet_link_tag 'application', :media => 'all' %>
<%= javascript_include_tag :defaults %>
<%= heads_for_wiki_formatter %>

Loading…
Cancel
Save