Merge remote-tracking branch 'origin/features/v6/permissions' into features/v6/permissions

Browse Source

# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java

...

This commit is contained in:

Alexander Söderberg

2020-07-23 15:06:00 +02:00

parent a7de76d150 b9a8846ee9

commit 384a6730a4

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

Diff Content Not Available