Alexander Söderberg e20319f4e1

Merge branch 'v5' into backups ...

# Conflicts:
#	Core/src/main/java/com/plotsquared/core/configuration/Captions.java

2020-05-11 20:15:48 +02:00

..

src/main

Merge branch 'v5' into backups

2020-05-11 20:15:48 +02:00

build.gradle

Merge features/v5/internal-updates into api/v5/packages

2020-04-16 06:11:03 +02:00

pom.xml

Merge features/v5/internal-updates into api/v5/packages

2020-04-16 06:11:03 +02:00