Alexander Söderberg 090bd69be5 Merge branch 'v6' into feature/v6/json ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java		2020-07-08 15:22:02 +02:00
..
src/main	Merge branch 'v6' into feature/v6/json	2020-07-08 15:22:02 +02:00
build.gradle	Merge branch 'v6' into feature/v6/json	2020-07-08 15:22:02 +02:00
pom.xml	Fixes PS-65	2020-07-08 12:21:31 +02:00