Update upstream

Browse Source

...

This commit is contained in:

Aikar

2016-12-19 22:58:12 -05:00

parent 4ac2cac9f9

commit c222ffd4cd

3 changed files with 2 additions and 25 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/CraftBukkit

Submodule work/CraftBukkit updated: 4602331b1d...c8ff65136f

2

work/Spigot

Submodule work/Spigot updated: aad97c46dc...6f7aabf0f7