From 42bc9c39a9cfdd338a0b55703b24d8bcad46cb28 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Sat, 18 Nov 2017 18:22:53 +0000
Subject: [PATCH] Merge upstream

---
 BungeeCord | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BungeeCord b/BungeeCord
index cccbb3c..4c84f37 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit cccbb3c889d7d9b5aaacfc5d5d3062bd0d660284
+Subproject commit 4c84f37fd23dfd67e4fee5dfd7cb62d67791129f