Alexander Söderberg 5608c5a901 Merge branch 'v6' into features/v6/permissions ...

# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
#	Core/src/main/java/com/plotsquared/core/command/Auto.java
#	Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
#	Core/src/main/java/com/plotsquared/core/util/Permissions.java

2020-07-24 12:20:45 +02:00

..

src/main

Merge branch 'v6' into features/v6/permissions

2020-07-24 12:20:45 +02:00

build.gradle

Fix dependencies

2020-07-23 15:03:57 +02:00

pom.xml

Fix dependencies

2020-07-23 15:03:57 +02:00