From 00a145e10f5355d28a65cabcd1a45e0bf17f0cfb Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Wed, 6 Jun 2018 11:17:32 +0100
Subject: [PATCH] Merge upstream (closes #233)

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

diff --git a/BungeeCord b/BungeeCord
index 968916c..68103e9 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit 968916c0b83550961e96da858f4be29a81c785b8
+Subproject commit 68103e9a8dd7d99322306e8c6fcc2cf3def7e877
diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index 233c4cf..7a0c06d 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From e9691571a6ae80c2f3faedd8c790d11cb914fd28 Mon Sep 17 00:00:00 2001
+From f9b6981e2774ff0131de9a1d42ce3ff4396f93dc 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 96b36d5f..c10c6442 100644
+index e7cec244..2a1b0d82 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -589,7 +589,7 @@ index 96b36d5f..c10c6442 100644
  
      <properties>
          <build.number>unknown</build.number>
-         <netty.version>4.1.24.Final</netty.version>
+         <netty.version>4.1.25.Final</netty.version>
 -        <maven.compiler.source>1.7</maven.compiler.source>
 -        <maven.compiler.target>1.7</maven.compiler.target>
 +        <!-- Require Java 8 -->
@@ -716,7 +716,7 @@ index bf4b399a..9a4b6529 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index be113c0d..f839ff88 100644
+index dcd6e5c4..0536e868 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@
@@ -828,5 +828,5 @@ index 9ecb2612..4b3613fa 100644
              <scope>compile</scope>
          </dependency>
 -- 
-2.17.0.windows.1
+2.17.1