From 4f0d50aac31d616fae12630924f91b8e71710c5d Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Sat, 14 Apr 2018 12:09:17 +0100
Subject: [PATCH] Merge upstream

---
 BungeeCord                                | 2 +-
 BungeeCord-Patches/0001-POM-Changes.patch | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/BungeeCord b/BungeeCord
index cbfdf64..79cd077 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit cbfdf64a15ddade2311db0db4296de4e5813398a
+Subproject commit 79cd077a60be961b1bcd790737f0c6e142e7bf2d
diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index 4555f9d..00aadb7 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 1b365ec47afe77f4b8927f09f8d116980d6a5bb4 Mon Sep 17 00:00:00 2001
+From 812e7b51055a2ac4ad35c9b12a2759a84fd1dd9b Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 10:33:31 -0700
 Subject: [PATCH] POM Changes
@@ -494,7 +494,7 @@ index 082f0908..8b045e3b 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 135f742c..c3cd07bf 100644
+index b8fb238a..b0cca9fc 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -589,7 +589,7 @@ index 135f742c..c3cd07bf 100644
  
      <properties>
          <build.number>unknown</build.number>
-         <netty.version>4.1.21.Final</netty.version>
+         <netty.version>4.1.23.Final</netty.version>
 -        <maven.compiler.source>1.7</maven.compiler.source>
 -        <maven.compiler.target>1.7</maven.compiler.target>
 +        <!-- Require Java 8 -->