From: Ian Weller <ian@gaslightmedia.com>
Date: Tue, 31 May 2016 17:17:19 +0000 (-0400)
Subject: Merge branch 'release/1.0.0'
X-Git-Tag: v1.0.0^0
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=c1124d48c5beda0e31b376ddda216d7cc0bd5d45;p=WP-Themes%2FParrotsLanding.git

Merge branch 'release/1.0.0'
---

c1124d48c5beda0e31b376ddda216d7cc0bd5d45
diff --cc header.php
index 8a789e7,75c6282..d15fdc9
--- a/header.php
+++ b/header.php
@@@ -7,9 -7,9 +7,10 @@@
  <meta http-equiv="imagetoolbar" content="false">
  
  <?php wp_head();?>
 +<link rel="shortcut icon" href="<?php echo get_template_directory_uri(); ?>/favicon.ico">
  <link rel="stylesheet" href="<?php bloginfo('template_url'); ?>/css/foundation.css" />
  <link type="text/css" rel="stylesheet" href="<?php echo get_template_directory_uri();?>/qs.css">
+ <link rel="shortcut icon" href="<?php echo get_template_directory_uri(); ?>/favicon.ico">
  <link type="text/css" rel="stylesheet" href="<?php echo get_stylesheet_uri();?>">
  <!-- Google Analytics Code -->
  </head>