Merge branch '3.5' into 3.6

Browse Source

...

This commit is contained in:

Dylan K. Taylor

2019-02-08 15:32:20 +00:00

parent 278f37d3e0 a975868fc3

commit 30b49e0d22

2 changed files with 2 additions and 2 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

src/pocketmine/resources/vanilla

Submodule src/pocketmine/resources/vanilla updated: 0c00c4f3b9...b9247957da