Alexander Söderberg 8eb903ad72 Merge branch 'v5' into v6 ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java		2020-07-14 19:18:08 +02:00
..
src/main	Merge branch 'v5' into v6	2020-07-14 19:18:08 +02:00
build.gradle	Merge branch 'v5' into v6	2020-07-14 19:18:08 +02:00
pom.xml	Merge branch 'v6' into feature/v6/platform	2020-07-14 19:05:05 +02:00