Merge branch 'master' into remove-summary-link-from-all-global-region…

…-page
DFID · Jan 7, 2016 · 61d895b · 61d895b
2 parents 5b972e8 + fd2da5f
commit 61d895b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/views/layouts/landing.erb b/views/layouts/landing.erb
@@ -37,7 +37,7 @@
 <link href="/stylesheets/aip-styles.css" media="screen" rel="stylesheet" type="text/css" />
 <link href="/stylesheets/graph-styles.css" media="screen" rel="stylesheet" type="text/css" />
 <link href="/stylesheets/main.css" media="screen" rel="stylesheet" type="text/css" />
-   
+<link type="image/x-icon" href="https://assets.digital.cabinet-office.gov.uk/static/favicon-8d811b8c3badbc0b0e2f6e25d3660a96cc0cca7993e6f32e98785f205fc40907.ico" rel="shortcut icon" />
    <!--  <script>  
         jQuery(function(){
           jQuery('.more-info-link').click( function(){

diff --git a/views/layouts/layout.erb b/views/layouts/layout.erb
@@ -40,6 +40,7 @@
     <link href="/stylesheets/graph-styles.css" media="screen" rel="stylesheet" type="text/css" />
     <link href="/stylesheets/main.css" media="screen" rel="stylesheet" type="text/css" />
     <link href="/stylesheets/c3-b03125fa.css" rel="stylesheet" type="text/css">
+    <link type="image/x-icon" href="https://assets.digital.cabinet-office.gov.uk/static/favicon-8d811b8c3badbc0b0e2f6e25d3660a96cc0cca7993e6f32e98785f205fc40907.ico" rel="shortcut icon" />
     <script src="/javascripts/jquery.scrollUp.min.js" type="text/javascript"></script>
    <!--  <script>  
         jQuery(function(){

diff --git a/views/layouts/layout_forms.erb b/views/layouts/layout_forms.erb
@@ -40,6 +40,7 @@
     <link href="/stylesheets/graph-styles.css" media="screen" rel="stylesheet" type="text/css" />
     <link href="/stylesheets/main.css" media="screen" rel="stylesheet" type="text/css" />
     <link href="/stylesheets/c3-b03125fa.css" rel="stylesheet" type="text/css">
+    <link type="image/x-icon" href="https://assets.digital.cabinet-office.gov.uk/static/favicon-8d811b8c3badbc0b0e2f6e25d3660a96cc0cca7993e6f32e98785f205fc40907.ico" rel="shortcut icon" />
     <script src="/javascripts/jquery.scrollUp.min.js" type="text/javascript"></script>
    <!--  <script>  
         jQuery(function(){