Update upstream B/CB

Browse Source

Merges fixes for SPIGOT-2404 and SPIGOT-2408 into Paper

...

This commit is contained in:

Zach Brown

2016-06-13 18:42:08 -05:00

parent 55fe08d4b9

commit 03eeadc2df

3 changed files with 4 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

work/Bukkit

Submodule work/Bukkit updated: 82821325a6...268e8e7836

2

work/CraftBukkit

Submodule work/CraftBukkit updated: 7f1a32252b...fb568fdc70