Permalink
Browse files

Merge remote branch 'andrewx/favicon' into favicon

  • Loading branch information...
2 parents bebafb0 + 292f07b commit 736ed3aeec375450b93c962a7aac7fcfe5979f86 @dta dta committed Mar 24, 2011
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -4,6 +4,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>CivicConnect</title>
<link rel="stylesheet" href="css/style.css" type="text/css" />
+ <link rel="icon" type="image/png" href="images/favicon.png" />
+ <link rel="shortcut icon" href="images/favicon.ico" />
+ <link rel="apple-touch-icon" href="images/apple-logo.png" />
</head>
<body>
View
3 views/layouts/defaultLayout.html 100755 → 100644
@@ -5,6 +5,9 @@
<title>{{pageTitle}}</title>
<link rel="stylesheet" href="/css/style.css" type="text/css" />
<link rel="stylesheet" href="/css/view_votes_style.css" type="text/css" />
+ <link rel="icon" type="image/png" href="/images/favicon.png" />
+ <link rel="shortcut icon" type="image/png" href="images/favicon.png" />
+ <link rel="apple-touch-icon" href="/images/apple-logo.png" />
<script src="/fieldValidations.js"></script>
</head>

0 comments on commit 736ed3a

Please sign in to comment.