Merge remote-tracking branch 'refs/remotes/sk89q/master'

Browse Source

# Conflicts:

#	worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java

...

This commit is contained in:

Jesse Boyd 2018-08-19 14:44:04 +10:00

parent 0cc0ee7f03 034c165bee

commit 2d55e616bf

No known key found for this signature in database

GPG Key ID: 59F1DE6293AF6E1F

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

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

Diff Content Not Available