Merge remote-tracking branch 'thisisaname/master'

2014-04-12 12:29:30 +02:00
parent 2a54145a52 3b6a964ae6
commit 079890b814
2 changed files with 2 additions and 0 deletions
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -3,6 +3,8 @@

 <head>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link rel="shortcut icon" href="./public/favicon.ico"> 
+ <!--<link rel="shortcut icon" href="http://www.fet.at/favicon.ico">-->
  <title>Fetsite</title>

 
--- a/public/favicon.ico
+++ b/public/favicon.ico