Alexander Söderberg 20e9d13f60 Merge branch 'v6' into feature/v6/json ... # Conflicts: # Core/src/main/java/com/plotsquared/core/util/MainUtil.java # Core/src/main/java/com/plotsquared/core/util/OperationUtil.java		2020-07-21 13:13:10 +02:00
..
src/main	Merge branch 'v6' into feature/v6/json	2020-07-21 13:13:10 +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