Alexander Söderberg 51bd21a464 Merge branch 'v6' into feature/v6/platform ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java		2020-07-08 13:57:33 +02:00
..
java/com/plotsquared/core	Merge branch 'v6' into feature/v6/platform	2020-07-08 13:57:33 +02:00
resources	Reformated and update French translation	2020-05-12 17:29:32 +02:00