PlotSquared/Bukkit
Alexander Söderberg 3a1b56494a Merge branch 'v6' into feature/v6/json
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
#	Core/src/main/java/com/plotsquared/core/command/Claim.java
#	Core/src/main/java/com/plotsquared/core/command/Condense.java
#	Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java
#	Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java
#	Core/src/main/java/com/plotsquared/core/util/task/ObjectTaskRunnable.java
#	Core/src/main/java/com/plotsquared/core/util/task/TaskManager.java
2020-07-17 17:58:14 +02:00
..
src/main Merge branch 'v6' into feature/v6/json 2020-07-17 17:58:14 +02:00
build.gradle Merge branch 'v6' into feature/v6/json 2020-07-14 19:25:14 +02:00
pom.xml Merge branch 'v6' into feature/v6/platform 2020-07-14 19:05:05 +02:00