From a71dd8754d9c56fe3c61e43813329b1482a0efd8 Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Tue, 25 Jul 2017 06:50:50 -0400
Subject: [PATCH 1/2] Fixes #2654 - Use right type attribute for icons

---
 resources/views/layout/master.blade.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php
index e6f69dca..dc056cb2 100644
--- a/resources/views/layout/master.blade.php
+++ b/resources/views/layout/master.blade.php
@@ -29,11 +29,11 @@
     <meta name="msapplication-TileImage" content="{{ asset('/img/favicon.png') }}" />
 
     @if (isset($favicon))
-    <link rel="icon" type="image/png" href="/img/{{ $favicon }}.ico">
-    <link rel="shortcut icon" href="/img/{{ $favicon }}.png" type="image/x-icon">
+    <link rel="icon" href="{{ asset("/img/{$favicon}.ico") }}" type="image/x-icon">
+    <link rel="shortcut icon" href="{{ asset("/img/{$favicon}.png") }}" type="image/png">
     @else
-    <link rel="icon" type="image/png" href="/img/favicon.ico">
-    <link rel="shortcut icon" href="/img/favicon.png" type="image/x-icon">
+    <link rel="icon" href="{{ asset('/img/favicon.ico') }}" type="image/x-icon">
+    <link rel="shortcut icon" href="{{ asset('/img/favicon.png') }}" type="image/png">
     @endif
 
     <link rel="apple-touch-icon" href="{{ asset('/img/apple-touch-icon.png') }}">

From 2fbab285f389da723ee7f763f85b31bcdb014c81 Mon Sep 17 00:00:00 2001
From: James Brooks <james@alt-three.com>
Date: Tue, 25 Jul 2017 10:51:07 +0000
Subject: [PATCH 2/2] Apply fixes from StyleCI

[ci skip] [skip ci]
---
 app/Bus/Exceptions/ComponentGroup/ComponentGroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Bus/Exceptions/ComponentGroup/ComponentGroup.php b/app/Bus/Exceptions/ComponentGroup/ComponentGroup.php
index ac33a195..8ca6edd0 100644
--- a/app/Bus/Exceptions/ComponentGroup/ComponentGroup.php
+++ b/app/Bus/Exceptions/ComponentGroup/ComponentGroup.php
@@ -18,7 +18,7 @@ use CachetHQ\Cachet\Bus\Exceptions\ExceptionInterface;
  *
  * @author James Brooks <james@alt-three.com>
  */
-interface ComponentGroupExceptionInterface extends ExceptionInterface
+interface ComponentGroup extends ExceptionInterface
 {
     //
 }