Update upstream

2017-06-09 08:29:44 -04:00 · 2017-06-09 08:29:44 -04:00 · e68554e5c6
commit e68554e5c6
parent 31eca1627b
10 changed files with 16 additions and 16 deletions
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772
+Subproject commit ed8c725d1906b97ab83eaeef4b6acf187c90575a
--- a/work/Spigot
+++ b/work/Spigot
@ -1 +1 @@
-Subproject commit ede465d4b574dc539984f807d2d8b37a78da1858
+Subproject commit d5dfb24fe8548399131df30df9995918bb58721e