Merge branch 'master' of https://github.com/andreassteph/fetsite into andi_spinnt

This commit is contained in:
Thomas Blazek
2015-02-25 10:37:12 +01:00
60 changed files with 585 additions and 210 deletions

View File

@@ -3,7 +3,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="logo2014_64.png">
<link rel="shortcut icon" href="<%= absurl("/logo2014_64.png")%>">
<!--<link rel="shortcut icon" href="http://www.fet.at/favicon.ico">-->
<!---->