Merge pull request #327 from Brokkonaut/master

Update upstream CB/S
2016-06-09 12:35:28 -05:00 · 2016-06-09 12:35:28 -05:00 · f4353accf6
parent 1fcc7495cd ace471101b
commit f4353accf6
2 changed files with 2 additions and 2 deletions
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit b2f31b74d0b455977493e058c2c217bd166aa3cd
+Subproject commit 10c10b3124020862b6e912c63938a337dda693fe
--- a/work/Spigot
+++ b/work/Spigot
@ -1 +1 @@
-Subproject commit da278d16b469b98f961d0e8fbffe81f274a930db
+Subproject commit 6016ac773a4f7bb51b82cdc0e8c87a6a8b164ceb
		`@ -1 +1 @@`
			`Subproject commit b2f31b74d0b455977493e058c2c217bd166aa3cd`				`Subproject commit 10c10b3124020862b6e912c63938a337dda693fe`
		`@ -1 +1 @@`
			`Subproject commit da278d16b469b98f961d0e8fbffe81f274a930db`				`Subproject commit 6016ac773a4f7bb51b82cdc0e8c87a6a8b164ceb`